Run Clippy in CI

Makefile

@@ -16,6 +16,12 @@ ifneq ($(C),)
 	cores_args := --cores $(C)
 endif
 
+CLIPPY ?= 1
+
+ifeq ($(CLIPPY),1)
+	nix_clippy_attr_prefix := withClippy.
+endif
+
 nix_args := $(keep_going_args) $(jobs_args) $(cores_args)
 
 append_to_nix_config := NIX_CONFIG="$$(printf "%s\n" "$$NIX_CONFIG" && cat hacking/binary-cache/fragment.nix.conf)"
@@ -98,7 +104,7 @@ try_restore_terminal := tput smam 2> /dev/null || true
 
 .PHONY: run-tests
 run-tests:
-	script=$$($(nix_build) -A runTests --no-out-link) && $$script
+	script=$$($(nix_build) -A $(nix_clippy_attr_prefix)runTests --no-out-link) && $$script
 	$(try_restore_terminal)
 
 .PHONY: run-sel4test-for
@@ -109,17 +115,17 @@ run-sel4test-for:
 
 .PHONY: run-fast-tests
 run-fast-tests:
-	script=$$($(nix_build) -A runFastTests --no-out-link) && $$script
+	script=$$($(nix_build) -A $(nix_clippy_attr_prefix)runFastTests --no-out-link) && $$script
 	$(try_restore_terminal)
 
 .PHONY: witness-tests
 witness-tests:
-	$(nix_build) -A witnessTests --no-out-link
+	$(nix_build) -A $(nix_clippy_attr_prefix)witnessTests --no-out-link
 	$(try_restore_terminal)
 
 .PHONY: witness-fast-tests
 witness-fast-tests:
-	$(nix_build) -A witnessFastTests --no-out-link
+	$(nix_build) -A $(nix_clippy_attr_prefix)witnessFastTests --no-out-link
 	$(try_restore_terminal)
 
 .PHONY: check-kani-proofs
@@ -134,23 +140,23 @@ check-kani-proofs:
 
 .PHONY: everything-except-non-incremental
 everything-except-non-incremental:
-	$(nix_build) -A everythingExceptNonIncremental --no-out-link
+	$(nix_build) -A $(nix_clippy_attr_prefix)everythingExceptNonIncremental --no-out-link
 
 .PHONY: everything
 everything:
-	$(nix_build) -A everything --no-out-link
+	$(nix_build) -A $(nix_clippy_attr_prefix)everything --no-out-link
 
 .PHONY: everything-with-excess
 everything-with-excess:
-	$(nix_build) -A everythingWithExcess --no-out-link
+	$(nix_build) -A $(nix_clippy_attr_prefix)everythingWithExcess --no-out-link
 
 .PHONY: html-links
 html-links:
-	$(nix_build) -A html -o $(out)/$@
+	$(nix_build) -A $(nix_clippy_attr_prefix)html -o $(out)/$@
 
 .PHONY: html
 html: | $(out)
-	src=$$($(nix_build) -A html --no-out-link) && \
+	src=$$($(nix_build) -A $(nix_clippy_attr_prefix)html --no-out-link) && \
 	dst=$(out)/html && \
 	rm -rf $$dst && \
 	cp -rL --no-preserve=owner,mode $$src $$dst

hacking/nix/default.nix

@@ -30,9 +30,9 @@ let
 
   treeHelpers = import ./tree-helpers.nix { inherit lib; };
 
-  makeOverridableWith = f: g: x: (g x) // {
+  makeOverridableWith = f: g: x: lib.fix (self: (g self x) // {
     override = x': makeOverridableWith f g (f x' x);
-  };
+  });
 
   crossSystems =
     with treeHelpers;
@@ -157,35 +157,20 @@ let
         (import ./overlay)
       ];
     };
+    attrs = {};
   };
 
-  mkThis =
-    with treeHelpers;
-    args: lib.fix (self:
-      let
-        concreteArgs = args self;
-        pkgs = untree (mapLeaves (crossSystem:
-          nixpkgsFn (concreteArgs.nixpkgsArgsFor crossSystem)
-        ) crossSystems);
-      in {
-        inherit lib pkgs;
-      } // import ./top-level self);
+  mkThis = self: args:
+    let
+      concreteArgs = args self;
+      pkgs = treeHelpers.untree (treeHelpers.mapLeaves (crossSystem:
+        nixpkgsFn (concreteArgs.nixpkgsArgsFor crossSystem)
+      ) crossSystems);
+    in {
+      inherit lib pkgs;
+    } // import ./top-level self // concreteArgs.attrs;
 
-  this = lib.fix (self: makeOverridableWith lib.id mkThis baseArgs // rec {
-    overrideNixpkgsArgs = f: self.override (superArgs: selfBase:
-      let
-        concreteSuperArgs = superArgs selfBase;
-      in
-        concreteSuperArgs // {
-          nixpkgsArgsFor = crossSystem: f (concreteSuperArgs.nixpkgsArgsFor crossSystem);
-        }
-    );
-    withOverlays = overlays: self.overrideNixpkgsArgs (superNixpkgsArgs:
-      superNixpkgsArgs // {
-        overlays = superNixpkgsArgs.overlays ++ overlays;
-      }
-    );
-  });
+  this = makeOverridableWith lib.id mkThis baseArgs;
 
 in
   this

hacking/nix/rust-utils/build-crates-in-layers.nix

@@ -10,22 +10,21 @@
 , vendorLockfile, pruneLockfile
 , defaultRustEnvironment, defaultRustTargetTriple
 , verus
+, scopeConfig
 }:
 
 let
   defaultStdenv = stdenv;
+in
+
+let
+  inherit (scopeConfig) runClippyDefault;
 
   # TODO not actually resulting in errors
   denyWarningsDefault =
     # true
     false
   ;
-
-  runClippyDefault =
-    # true
-    false
-  ;
-
 in
 
 { stdenv ? defaultStdenv

hacking/nix/scope/default.nix

@@ -36,10 +36,25 @@ let
   fenix = import fenixSource {};
 in
 
+let
+  elaborateScopeConfig =
+    { runClippyDefault ? false
+    }:
+    {
+      inherit
+        runClippyDefault
+      ;
+    };
+in
+
 superCallPackage ../rust-utils {} self //
 
 (with self; {
 
+  overridableScopeConfig = {};
+
+  scopeConfig = elaborateScopeConfig overridableScopeConfig;
+
   sources = callPackage ./sources.nix {};
 
   seL4Arch = with hostPlatform;

hacking/nix/top-level/default.nix

@@ -11,6 +11,32 @@ let
   aggregate = name: drvs: pkgs.build.writeText "aggregate-${name}" (toString (lib.flatten drvs));
 
 in {
+  overrideNixpkgsArgs = f: self.override (superArgs: selfBase:
+    let
+      concreteSuperArgs = superArgs selfBase;
+    in
+      concreteSuperArgs // {
+        nixpkgsArgsFor = crossSystem: f (concreteSuperArgs.nixpkgsArgsFor crossSystem);
+      }
+  );
+
+  withOverlays = overlays: self.overrideNixpkgsArgs (superNixpkgsArgs:
+    superNixpkgsArgs // {
+      overlays = superNixpkgsArgs.overlays ++ overlays;
+    }
+  );
+
+  withConfigOverride = f: self.withOverlays [
+    (self': super': {
+      this = super'.this.overrideScope (self'': super'': {
+        overridableScopeConfig = f super''.overridableScopeConfig;
+      });
+    })
+  ];
+
+  withClippy = self.withConfigOverride (super: super // {
+    runClippyDefault = true;
+  });
 
   inherit (pkgs.build.this) shellForMakefile shellForHacking;