Format all Nix files

Author: infinisil

default.nix

@@ -4,54 +4,70 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
+let
+  sources = import ./npins;
+in
 {
   system ? builtins.currentSystem,
-  sources ? import ./npins,
+  nixpkgs ? sources.nixpkgs,
+  serokell-nix ? sources.serokell-nix,
 }:
 let
   overlay = self: super: {
     haskell = super.haskell // {
-      packageOverrides = self: super: {
-        nixfmt = self.callCabal2nix "nixfmt" src { };
-      };
+      packageOverrides = self: super: { nixfmt = self.callCabal2nix "nixfmt" src { }; };
     };
   };
 
-  pkgs = import sources.nixpkgs {
+  pkgs = import nixpkgs {
     inherit system;
-    overlays = [ overlay (import (sources.serokell-nix + "/overlay")) ];
-    config = {};
+    overlays = [
+      overlay
+      (import (serokell-nix + "/overlay"))
+    ];
+    config = { };
   };
 
   inherit (pkgs) haskell lib;
 
-  regexes =
-    [ ".*.cabal$" "^src.*" "^main.*" "^Setup.hs$" "^js.*" "LICENSE" ];
+  regexes = [
+    ".*.cabal$"
+    "^src.*"
+    "^main.*"
+    "^Setup.hs$"
+    "^js.*"
+    "LICENSE"
+  ];
   src = builtins.path {
     path = ./.;
     name = "nixfmt-src";
-    filter = path: type:
-      let relPath = lib.removePrefix (toString ./. + "/") (toString path);
-      in lib.any (re: builtins.match re relPath != null) regexes;
+    filter =
+      path: type:
+      let
+        relPath = lib.removePrefix (toString ./. + "/") (toString path);
+      in
+      lib.any (re: builtins.match re relPath != null) regexes;
   };
 
   build = pkgs.haskellPackages.nixfmt;
-
 in
-build // rec {
+build
+// rec {
   packages = {
     nixfmt = build;
     nixfmt-static = haskell.lib.justStaticExecutables packages.nixfmt;
     nixfmt-deriver = packages.nixfmt-static.cabal2nixDeriver;
 
     nixfmt-shell = packages.nixfmt.env.overrideAttrs (oldAttrs: {
-      buildInputs = oldAttrs.buildInputs ++ (with pkgs; [
-        # nixfmt: expand
-        cabal-install
-        stylish-haskell
-        shellcheck
-        npins
-      ]);
+      buildInputs =
+        oldAttrs.buildInputs
+        ++ (with pkgs; [
+          # nixfmt: expand
+          cabal-install
+          stylish-haskell
+          shellcheck
+          npins
+        ]);
     });
 
     inherit (pkgs) reuse;

flake.nix

@@ -6,13 +6,14 @@
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { flake-utils, self }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    { flake-utils, self }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
-        result = import ./default.nix {
-          inherit system;
-        };
-      in {
+        result = import ./default.nix { inherit system; };
+      in
+      {
         packages = result.packages // {
           default = result;
         };
@@ -23,5 +24,6 @@
         };
 
         checks = result.checks;
-      });
+      }
+    );
 }

npins/default.nix

@@ -3,18 +3,32 @@ let
   data = builtins.fromJSON (builtins.readFile ./sources.json);
   version = data.version;
 
-  mkSource = spec:
-    assert spec ? type; let
+  mkSource =
+    spec:
+    assert spec ? type;
+    let
       path =
-        if spec.type == "Git" then mkGitSource spec
-        else if spec.type == "GitRelease" then mkGitSource spec
-        else if spec.type == "PyPi" then mkPyPiSource spec
-        else if spec.type == "Channel" then mkChannelSource spec
-        else builtins.throw "Unknown source type ${spec.type}";
+        if spec.type == "Git" then
+          mkGitSource spec
+        else if spec.type == "GitRelease" then
+          mkGitSource spec
+        else if spec.type == "PyPi" then
+          mkPyPiSource spec
+        else if spec.type == "Channel" then
+          mkChannelSource spec
+        else
+          builtins.throw "Unknown source type ${spec.type}";
     in
     spec // { outPath = path; };
 
-  mkGitSource = { repository, revision, url ? null, hash, ... }:
+  mkGitSource =
+    {
+      repository,
+      revision,
+      url ? null,
+      hash,
+      ...
+    }:
     assert repository ? type;
     # At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
     # In the latter case, there we will always be an url to the tarball
@@ -23,19 +37,23 @@ let
         inherit url;
         sha256 = hash; # FIXME: check nix version & use SRI hashes
       })
-    else assert repository.type == "Git"; builtins.fetchGit {
-      url = repository.url;
-      rev = revision;
-      # hash = hash;
-    };
+    else
+      assert repository.type == "Git";
+      builtins.fetchGit {
+        url = repository.url;
+        rev = revision;
+        # hash = hash;
+      };
 
-  mkPyPiSource = { url, hash, ... }:
+  mkPyPiSource =
+    { url, hash, ... }:
     builtins.fetchurl {
       inherit url;
       sha256 = hash;
     };
 
-  mkChannelSource = { url, hash, ... }:
+  mkChannelSource =
+    { url, hash, ... }:
     builtins.fetchTarball {
       inherit url;
       sha256 = hash;