feat: switch to nixfmt

NixOS/rfcs#166 Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
rvolosatovs · Dec 9, 2024 · 9fe204b · 9fe204b
1 parent aa8a477
commit 9fe204b
Show file tree

Hide file tree

Showing 20 changed files with 1,235 additions and 1,127 deletions.
diff --git a/checks/default.nix b/checks/default.nix
@@ -6,8 +6,10 @@
 }:
 with flake-utils.lib.system;
 with nixlib.lib;
-with self.lib; let
-  assertRustOutputs = flake: name:
+with self.lib;
+let
+  assertRustOutputs =
+    flake: name:
     assert name != "default";
     assert name != "rust";
     assert flake ? checks;
@@ -18,14 +20,14 @@ with self.lib; let
     assert flake.overlays ? default;
     assert flake.overlays ? fenix;
     assert flake.overlays ? rust-overlay;
-      system:
-        assert flake.checks.${system} ? clippy;
-        assert flake.checks.${system} ? fmt;
-        assert flake.checks.${system} ? nextest;
-        assert flake.devShells.${system} ? default;
-          mapAttrs' (n: nameValuePair "${name}-check-${n}") flake.checks.${system}
-          // mapAttrs' (n: nameValuePair "${name}-shell-${n}") flake.devShells.${system}
-          // mapAttrs' (n: nameValuePair "${name}-package-${n}") flake.packages.${system};
+    system:
+    assert flake.checks.${system} ? clippy;
+    assert flake.checks.${system} ? fmt;
+    assert flake.checks.${system} ? nextest;
+    assert flake.devShells.${system} ? default;
+    mapAttrs' (n: nameValuePair "${name}-check-${n}") flake.checks.${system}
+    // mapAttrs' (n: nameValuePair "${name}-shell-${n}") flake.devShells.${system}
+    // mapAttrs' (n: nameValuePair "${name}-package-${n}") flake.packages.${system};
 
   flakes.rust.complex = (import ../examples/rust-complex/flake.nix).outputs {
     nixify = self;
@@ -47,33 +49,38 @@ with self.lib; let
     nixify = self;
   };
 in
-  genAttrs [
+genAttrs
+  [
     aarch64-darwin
     aarch64-linux
     x86_64-darwin
     x86_64-linux
   ]
-  (system: let
-    isDarwin = system == aarch64-darwin || system == x86_64-darwin;
-    assertRustPackages = attrs: name: x:
-      assert attrs.${system} ? "${name}-aarch64-apple-darwin" || !isDarwin;
-      assert attrs.${system} ? "${name}-aarch64-apple-darwin-oci" || !isDarwin;
-      assert attrs.${system} ? "${name}-aarch64-unknown-linux-gnu";
-      assert attrs.${system} ? "${name}-aarch64-unknown-linux-gnu-oci";
-      assert attrs.${system} ? "${name}-aarch64-unknown-linux-musl";
-      assert attrs.${system} ? "${name}-aarch64-unknown-linux-musl-oci";
-      assert attrs.${system} ? "${name}-armv7-unknown-linux-musleabihf";
-      assert attrs.${system} ? "${name}-armv7-unknown-linux-musleabihf-oci";
-      assert attrs.${system} ? "${name}-x86_64-apple-darwin" || system != x86_64-darwin;
-      assert attrs.${system} ? "${name}-x86_64-apple-darwin-oci" || system != x86_64-darwin;
-      assert attrs.${system} ? "${name}-x86_64-pc-windows-gnu";
-      assert attrs.${system} ? "${name}-x86_64-pc-windows-gnu-oci";
-      assert attrs.${system} ? "${name}-x86_64-unknown-linux-gnu";
-      assert attrs.${system} ? "${name}-x86_64-unknown-linux-gnu-oci";
-      assert attrs.${system} ? "${name}-x86_64-unknown-linux-musl";
-      assert attrs.${system} ? "${name}-x86_64-unknown-linux-musl-oci";
-      assert attrs.${system} ? ${name}; x;
-  in
+  (
+    system:
+    let
+      isDarwin = system == aarch64-darwin || system == x86_64-darwin;
+      assertRustPackages =
+        attrs: name: x:
+        assert attrs.${system} ? "${name}-aarch64-apple-darwin" || !isDarwin;
+        assert attrs.${system} ? "${name}-aarch64-apple-darwin-oci" || !isDarwin;
+        assert attrs.${system} ? "${name}-aarch64-unknown-linux-gnu";
+        assert attrs.${system} ? "${name}-aarch64-unknown-linux-gnu-oci";
+        assert attrs.${system} ? "${name}-aarch64-unknown-linux-musl";
+        assert attrs.${system} ? "${name}-aarch64-unknown-linux-musl-oci";
+        assert attrs.${system} ? "${name}-armv7-unknown-linux-musleabihf";
+        assert attrs.${system} ? "${name}-armv7-unknown-linux-musleabihf-oci";
+        assert attrs.${system} ? "${name}-x86_64-apple-darwin" || system != x86_64-darwin;
+        assert attrs.${system} ? "${name}-x86_64-apple-darwin-oci" || system != x86_64-darwin;
+        assert attrs.${system} ? "${name}-x86_64-pc-windows-gnu";
+        assert attrs.${system} ? "${name}-x86_64-pc-windows-gnu-oci";
+        assert attrs.${system} ? "${name}-x86_64-unknown-linux-gnu";
+        assert attrs.${system} ? "${name}-x86_64-unknown-linux-gnu-oci";
+        assert attrs.${system} ? "${name}-x86_64-unknown-linux-musl";
+        assert attrs.${system} ? "${name}-x86_64-unknown-linux-musl-oci";
+        assert attrs.${system} ? ${name};
+        x;
+    in
     assert flakes.rust.complex.checks.${system} ? doctest;
     assert flakes.rust.complex.packages.${system} ? default;
     assert flakes.rust.hello-multibin.packages.${system} ? default;
@@ -84,9 +91,13 @@ in
     assert flakes.rust.lib.packages.${system} ? rust-lib-wasm32-wasip2;
     assert flakes.rust.workspace.packages.${system} ? default;
     assert flakes.rust.workspace.packages.${system} ? rust-workspace-wasm32-wasip2;
-      (assertRustPackages flakes.rust.complex.packages "rust-complex")
+    (assertRustPackages flakes.rust.complex.packages "rust-complex")
       (assertRustPackages flakes.rust.hello-multibin.packages "rust-hello-multibin")
       (assertRustPackages flakes.rust.hello.packages "rust-hello")
       (assertRustPackages flakes.rust.lib.packages "rust-lib")
       (assertRustPackages flakes.rust.workspace.packages "rust-workspace")
-      foldl (checks: example: checks // (assertRustOutputs flakes.rust.${example} "rust-${example}" system)) {} (attrNames flakes.rust))
+      foldl
+      (checks: example: checks // (assertRustOutputs flakes.rust.${example} "rust-${example}" system))
+      { }
+      (attrNames flakes.rust)
+  )
diff --git a/examples/rust-complex/flake.nix b/examples/rust-complex/flake.nix
@@ -1,7 +1,8 @@
 {
   inputs.nixify.url = "github:rvolosatovs/nixify";
 
-  outputs = {nixify, ...}:
+  outputs =
+    { nixify, ... }:
     nixify.lib.rust.mkFlake {
       src = ./.;
 

diff --git a/examples/rust-hello-multibin/flake.nix b/examples/rust-hello-multibin/flake.nix
@@ -1,7 +1,8 @@
 {
   inputs.nixify.url = "github:rvolosatovs/nixify";
 
-  outputs = {nixify, ...}:
+  outputs =
+    { nixify, ... }:
     nixify.lib.rust.mkFlake {
       src = ./.;
     };

diff --git a/examples/rust-hello/flake.nix b/examples/rust-hello/flake.nix
@@ -1,7 +1,8 @@
 {
   inputs.nixify.url = "github:rvolosatovs/nixify";
 
-  outputs = {nixify, ...}:
+  outputs =
+    { nixify, ... }:
     nixify.lib.rust.mkFlake {
       src = ./.;
       excludePaths = [

diff --git a/examples/rust-lib/flake.nix b/examples/rust-lib/flake.nix
@@ -1,7 +1,8 @@
 {
   inputs.nixify.url = "github:rvolosatovs/nixify";
 
-  outputs = {nixify, ...}:
+  outputs =
+    { nixify, ... }:
     nixify.lib.rust.mkFlake {
       src = ./.;
       cargoLock = ./Cargo.test.lock;

diff --git a/examples/rust-workspace/flake.nix b/examples/rust-workspace/flake.nix
@@ -1,7 +1,8 @@
 {
   inputs.nixify.url = "github:rvolosatovs/nixify";
 
-  outputs = {nixify, ...}:
+  outputs =
+    { nixify, ... }:
     nixify.lib.rust.mkFlake {
       src = ./.;
       name = "rust-workspace";

diff --git a/flake.nix b/flake.nix
@@ -32,38 +32,40 @@
   inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs-nixos";
   inputs.rust-overlay.url = "github:oxalica/rust-overlay";
 
-  outputs = inputs: let
-    lib = import ./lib inputs;
-  in
+  outputs =
+    inputs:
+    let
+      lib = import ./lib inputs;
+    in
     with lib;
-      mkFlake {
-        excludePaths = [
-          ".github"
-          ".gitignore"
-          "flake.lock"
-          "flake.nix"
-          "LICENSE"
-          "README.md"
-        ];
+    mkFlake {
+      excludePaths = [
+        ".github"
+        ".gitignore"
+        "flake.lock"
+        "flake.nix"
+        "LICENSE"
+        "README.md"
+      ];
 
-        withDevShells = {
+      withDevShells =
+        {
           pkgs,
           devShells,
           ...
         }:
-          extendDerivations {
-            buildInputs = with pkgs; [
-              buildah
-              wasmtime
-              zig
-            ];
-          }
-          devShells;
-      }
-      // {
-        inherit lib;
+        extendDerivations {
+          buildInputs = with pkgs; [
+            buildah
+            wasmtime
+            zig
+          ];
+        } devShells;
+    }
+    // {
+      inherit lib;
 
-        checks = import ./checks inputs;
-        templates = import ./templates inputs;
-      };
+      checks = import ./checks inputs;
+      templates = import ./templates inputs;
+    };
 }
diff --git a/lib/default.nix b/lib/default.nix
@@ -3,10 +3,11 @@
   nixlib,
   nix-filter,
   ...
-} @ inputs:
+}@inputs:
 with flake-utils.lib.system;
 with nixlib.lib;
-with builtins; let
+with builtins;
+let
   f = self': {
     eq = x: y: x == y;
 
@@ -16,24 +17,24 @@ with builtins; let
 
     extendDerivations = import ./extendDerivations.nix inputs;
 
-    filterSource = {
-      include ? null,
-      exclude ? self'.defaultExcludePaths,
-      src,
-    }:
-      nix-filter.lib.filter ({
+    filterSource =
+      {
+        include ? null,
+        exclude ? self'.defaultExcludePaths,
+        src,
+      }:
+      nix-filter.lib.filter (
+        {
           inherit exclude;
           root = src;
         }
         // optionalAttrs (include != null) {
           inherit include;
-        });
+        }
+      );
 
     readTOML = file: fromTOML (readFile file);
-    readTOMLOr = path: def:
-      if pathExists path
-      then self'.readTOML path
-      else def;
+    readTOMLOr = path: def: if pathExists path then self'.readTOML path else def;
 
     defaultExcludePaths = [
       ".codecov.yml"
@@ -44,7 +45,7 @@ with builtins; let
       "flake.nix"
     ];
 
-    defaultNixpkgsConfig = {};
+    defaultNixpkgsConfig = { };
 
     defaultSystems = [
       aarch64-darwin
@@ -53,12 +54,12 @@ with builtins; let
       x86_64-linux
     ];
 
-    defaultWithApps = {apps, ...}: apps;
-    defaultWithChecks = {checks, ...}: checks;
-    defaultWithDevShells = {devShells, ...}: devShells;
-    defaultWithFormatter = {formatter, ...}: formatter;
-    defaultWithOverlays = {overlays, ...}: overlays;
-    defaultWithPackages = {packages, ...}: packages;
+    defaultWithApps = { apps, ... }: apps;
+    defaultWithChecks = { checks, ... }: checks;
+    defaultWithDevShells = { devShells, ... }: devShells;
+    defaultWithFormatter = { formatter, ... }: formatter;
+    defaultWithOverlays = { overlays, ... }: overlays;
+    defaultWithPackages = { packages, ... }: packages;
   };
 in
-  fix f
+fix f
diff --git a/lib/extendDerivations.nix b/lib/extendDerivations.nix
@@ -5,23 +5,27 @@
 }:
 with nixlib.lib;
 with builtins;
-  {
-    buildInputs ? [],
-    depsBuildBuild ? [],
-    env ? null,
-    inputsFrom ? [],
-    nativeBuildInputs ? [],
-    packages ? [],
-  }:
-    mapAttrs (n: v:
-      v.overrideAttrs (attrs:
-        {
-          buildInputs = (attrs.buildInputs or []) ++ buildInputs;
-          depsBuildBuild = (attrs.depsBuildBuild or []) ++ depsBuildBuild;
-          inputsFrom = (attrs.inputsFrom or []) ++ inputsFrom;
-          nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ nativeBuildInputs;
-          packages = (attrs.packages or []) ++ packages;
-        }
-        // optionalAttrs (env != null) {
-          env = (attrs.env or {}) // env;
-        }))
+{
+  buildInputs ? [ ],
+  depsBuildBuild ? [ ],
+  env ? null,
+  inputsFrom ? [ ],
+  nativeBuildInputs ? [ ],
+  packages ? [ ],
+}:
+mapAttrs (
+  n: v:
+  v.overrideAttrs (
+    attrs:
+    {
+      buildInputs = (attrs.buildInputs or [ ]) ++ buildInputs;
+      depsBuildBuild = (attrs.depsBuildBuild or [ ]) ++ depsBuildBuild;
+      inputsFrom = (attrs.inputsFrom or [ ]) ++ inputsFrom;
+      nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ nativeBuildInputs;
+      packages = (attrs.packages or [ ]) ++ packages;
+    }
+    // optionalAttrs (env != null) {
+      env = (attrs.env or { }) // env;
+    }
+  )
+)