Merge pull request #130 from nikstur/housekeeping

Housekeeping
nikstur · Sep 6, 2024 · 1df4bd1 · 1df4bd1
2 parents a3c38ce + 82340a6
commit 1df4bd1
Show file tree

Hide file tree

Showing 12 changed files with 344 additions and 238 deletions.
diff --git a/examples/crane/flake.nix b/examples/crane/flake.nix
@@ -15,8 +15,17 @@
     bombon.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, bombon, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      crane,
+      flake-utils,
+      bombon,
+      ...
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
 
@@ -33,11 +42,12 @@
           ];
         };
 
-        my-crate = bombon.lib.${system}.passthruVendoredSbom.rust
-          (craneLib.buildPackage (commonArgs // {
+        my-crate = bombon.lib.${system}.passthruVendoredSbom.rust (craneLib.buildPackage (
+          commonArgs
+          // {
             cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-          }))
-          { inherit pkgs; };
+          }
+        )) { inherit pkgs; };
       in
       {
         checks = {
@@ -55,5 +65,6 @@
           # Inherit inputs from checks.
           checks = self.checks.${system};
         };
-      });
+      }
+    );
 }
diff --git a/examples/flakes/flake.nix b/examples/flakes/flake.nix
@@ -5,7 +5,12 @@
     bombon.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, bombon }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      bombon,
+    }:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,11 +7,6 @@
 
     systems.url = "github:nix-systems/default";
 
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.systems.follows = "systems";
-    };
-
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
@@ -26,99 +21,123 @@
 
   };
 
-  outputs = inputs@{ self, flake-parts, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } {
-    systems = import systems;
-
-    imports =
-      let
-        # This is effectively just boilerplate to allow us to keep the `lib`
-        # output.
-        libOutputModule = { lib, ... }: flake-parts.lib.mkTransposedPerSystemModule {
-          name = "lib";
-          option = lib.mkOption {
-            type = lib.types.lazyAttrsOf lib.types.anything;
-            default = { };
-          };
-          file = "";
+  outputs =
+    inputs@{
+      self,
+      flake-parts,
+      systems,
+      ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = import systems;
+
+      imports =
+        let
+          # This is effectively just boilerplate to allow us to keep the `lib`
+          # output.
+          libOutputModule =
+            { lib, ... }:
+            flake-parts.lib.mkTransposedPerSystemModule {
+              name = "lib";
+              option = lib.mkOption {
+                type = lib.types.lazyAttrsOf lib.types.anything;
+                default = { };
+              };
+              file = "";
+            };
+        in
+        [
+          inputs.pre-commit-hooks-nix.flakeModule
+          libOutputModule
+        ];
+
+      flake = {
+        templates.default = {
+          path = builtins.filterSource (path: type: baseNameOf path == "flake.nix") ./examples/flakes;
+          description = "Build a Bom for GNU hello";
         };
-      in
-      [
-        inputs.pre-commit-hooks-nix.flakeModule
-        libOutputModule
-      ];
-
-    flake = {
-      templates.default = {
-        path = builtins.filterSource (path: type: baseNameOf path == "flake.nix")
-          ./examples/flakes;
-        description = "Build a Bom for GNU hello";
       };
-    };
 
-    perSystem = { config, system, pkgs, lib, ... }:
-      let
-        bombon = import ./. { inherit pkgs; };
-        inherit (bombon) transformer buildBom passthruVendoredSbom;
-      in
-      {
-        lib = { inherit buildBom passthruVendoredSbom; };
-
-        packages = {
-          # This is mostly here for development
-          inherit transformer;
-          default = transformer;
-          sbom = buildBom transformer { };
-        };
+      perSystem =
+        {
+          config,
+          system,
+          pkgs,
+          lib,
+          ...
+        }:
+        let
+          bombon = import ./. { inherit pkgs; };
+          inherit (bombon) transformer buildBom passthruVendoredSbom;
+        in
+        {
+          lib = {
+            inherit buildBom passthruVendoredSbom;
+          };
 
-        checks = {
-          clippy = transformer.overrideAttrs (_: previousAttrs: {
-            pname = previousAttrs.pname + "-clippy";
-            nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.clippy ];
-            checkPhase = "cargo clippy";
-          });
-          rustfmt = transformer.overrideAttrs (_: previousAttrs: {
-            pname = previousAttrs.pname + "-rustfmt";
-            nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.rustfmt ];
-            checkPhase = "cargo fmt --check";
-          });
-        } // import ./nix/tests { inherit pkgs buildBom passthruVendoredSbom; };
-
-        pre-commit = {
-          check.enable = true;
-
-          settings = {
-            hooks = {
-              nixpkgs-fmt.enable = true;
-              typos.enable = true;
-              statix = {
-                enable = true;
-                settings.ignore = [ "sources.nix" ];
+          packages = {
+            # This is mostly here for development
+            inherit transformer;
+            default = transformer;
+            sbom = buildBom transformer { };
+          };
+
+          checks = {
+            clippy = transformer.overrideAttrs (
+              _: previousAttrs: {
+                pname = previousAttrs.pname + "-clippy";
+                nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.clippy ];
+                checkPhase = "cargo clippy";
+              }
+            );
+            rustfmt = transformer.overrideAttrs (
+              _: previousAttrs: {
+                pname = previousAttrs.pname + "-rustfmt";
+                nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.rustfmt ];
+                checkPhase = "cargo fmt --check";
+              }
+            );
+          } // import ./nix/tests { inherit pkgs buildBom passthruVendoredSbom; };
+
+          pre-commit = {
+            check.enable = true;
+
+            settings = {
+              hooks = {
+                nixfmt-rfc-style = {
+                  enable = true;
+                  excludes = [ "sources.nix" ];
+                };
+                typos.enable = true;
+                statix = {
+                  enable = true;
+                  settings.ignore = [ "sources.nix" ];
+                };
               };
             };
           };
-        };
 
-        devShells.default = pkgs.mkShell {
-          shellHook = ''
-            ${config.pre-commit.installationScript}
-          '';
-
-          packages = [
-            pkgs.niv
-            pkgs.clippy
-            pkgs.rustfmt
-            pkgs.cargo-machete
-            pkgs.cargo-edit
-            pkgs.cargo-bloat
-            pkgs.cargo-deny
-            pkgs.cargo-cyclonedx
-          ];
-
-          inputsFrom = [ transformer ];
-
-          RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
-        };
+          devShells.default = pkgs.mkShell {
+            shellHook = ''
+              ${config.pre-commit.installationScript}
+            '';
+
+            packages = [
+              pkgs.niv
+              pkgs.clippy
+              pkgs.rustfmt
+              pkgs.cargo-machete
+              pkgs.cargo-edit
+              pkgs.cargo-bloat
+              pkgs.cargo-deny
+              pkgs.cargo-cyclonedx
+            ];
+
+            inputsFrom = [ transformer ];
+
+            RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+          };
 
-      };
-  };
+        };
+    };
 }
diff --git a/nix/build-bom.nix b/nix/build-bom.nix
@@ -1,13 +1,16 @@
-{ lib
-, runCommand
-, transformer
-, buildtimeDependencies
-, runtimeDependencies
+{
+  lib,
+  runCommand,
+  transformer,
+  buildtimeDependencies,
+  runtimeDependencies,
 }:
 
-drv: { extraPaths ? [ ]
-     , includeBuildtimeDependencies ? false
-     }:
+drv:
+{
+  extraPaths ? [ ],
+  includeBuildtimeDependencies ? false,
+}:
 
 let
   flags = lib.optionals includeBuildtimeDependencies [
@@ -21,4 +24,3 @@ runCommand "${drv.name}.cdx.json" { nativeBuildInputs = [ transformer ]; } ''
     ${runtimeDependencies drv extraPaths} \
     $out
 ''
-