From 2456dbe068de398c16ace0705beb2f21d170db12 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 11 Mar 2023 00:52:21 +0000
Subject: [PATCH] feat(nix): refactor out common args

---
 .cargo/audit.toml |  5 +++++
 flake.nix         | 50 ++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 .cargo/audit.toml

diff --git a/.cargo/audit.toml b/.cargo/audit.toml
new file mode 100644
index 0000000..72008c3
--- /dev/null
+++ b/.cargo/audit.toml
@@ -0,0 +1,5 @@
+[advisories]
+ignore = [
+    "RUSTSEC-2023-0018",
+    "RUSTSEC-2021-0019"
+]
diff --git a/flake.nix b/flake.nix
index d615686..2616824 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,38 +49,40 @@
 
       rustStable = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
       craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
-      src = craneLib.cleanCargoSource ./.;
-      cargoArtifacts = craneLib.buildDepsOnly {inherit src buildInputs;};
-      buildInputs = [];
 
-      file-collector = craneLib.buildPackage {
-        inherit src;
-        doCheck = false;
-      };
-
-      file-collector-clippy = craneLib.cargoClippy {
-        inherit cargoArtifacts src buildInputs;
+      commonArgs = {
+        src = craneLib.cleanCargoSource ./.;
+        buildInputs = [];
+        nativeBuildInputs = [];
         cargoClippyExtraArgs = "--all-targets -- --deny warnings";
       };
 
-      file-collector-fmt = craneLib.cargoFmt {inherit src;};
+      cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {doCheck = false;});
 
-      file-collector-audit = craneLib.cargoAudit {inherit src advisory-db;};
+      file-collector = craneLib.buildPackage (commonArgs
+        // {
+          inherit cargoArtifacts;
+          doCheck = false;
+        });
 
-      file-collector-nextest = craneLib.cargoNextest {
-        inherit cargoArtifacts src buildInputs;
-        partitions = 1;
-        partitionType = "count";
-      };
+      file-collector-clippy = craneLib.cargoClippy (commonArgs
+        // {
+          inherit cargoArtifacts;
+        });
+
+      file-collector-fmt = craneLib.cargoFmt (commonArgs // {});
+
+      file-collector-audit = craneLib.cargoAudit (commonArgs // {inherit advisory-db;});
+
+      file-collector-nextest = craneLib.cargoNextest (commonArgs
+        // {
+          inherit cargoArtifacts;
+          partitions = 1;
+          partitionType = "count";
+        });
     in {
       checks = {
-        inherit
-          file-collector
-          file-collector-audit
-          file-collector-clippy
-          file-collector-fmt
-          file-collector-nextest
-          ;
+        inherit file-collector file-collector-audit file-collector-clippy file-collector-fmt file-collector-nextest;
       };
 
       packages.default = file-collector;