treewide: nix fmt

default.nix

@@ -7,7 +7,9 @@
     in
       fetchTarball {
         url =
-          lock.nodes.${nodeName}.locked.url
+          lock.nodes.${
+            nodeName
+          }.locked.url
           or "https://github.com/edolstra/flake-compat/archive/${
             lock.nodes.${nodeName}.locked.rev
           }.tar.gz";

npins/default.nix

@@ -13,8 +13,10 @@ let
   version = data.version;
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range =
+  range = first: last:
-    first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
+    if first > last
+    then []
+    else builtins.genList (n: first + n) (last - first + 1);
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
   stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@@ -27,47 +29,44 @@ let
   # If the environment variable NPINS_OVERRIDE_${name} is set, then use
   # the path directly as opposed to the fetched source.
   # (Taken from Niv for compatibility)
-  mayOverride =
+  mayOverride = name: path: let
-    name: path:
-    let
     envVarName = "NPINS_OVERRIDE_${saneName}";
-      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
+    saneName = stringAsChars (c:
+      if (builtins.match "[a-zA-Z0-9]" c) == null
+      then "_"
+      else c)
+    name;
     ersatz = builtins.getEnv envVarName;
   in
-    if ersatz == "" then
+    if ersatz == ""
-      path
+    then path
     else
       # this turns the string into an actual Nix path (for both absolute and
       # relative paths)
       builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
-        if builtins.substring 0 1 ersatz == "/" then
+        if builtins.substring 0 1 ersatz == "/"
-          /. + ersatz
+        then /. + ersatz
-        else
+        else /. + builtins.getEnv "PWD" + "/${ersatz}"
-          /. + builtins.getEnv "PWD" + "/${ersatz}"
       );
 
-  mkSource =
+  mkSource = name: spec:
-    name: spec:
+    assert spec ? type; let
-    assert spec ? type;
-    let
       path =
-        if spec.type == "Git" then
+        if spec.type == "Git"
-          mkGitSource spec
+        then mkGitSource spec
-        else if spec.type == "GitRelease" then
+        else if spec.type == "GitRelease"
-          mkGitSource spec
+        then mkGitSource spec
-        else if spec.type == "PyPi" then
+        else if spec.type == "PyPi"
-          mkPyPiSource spec
+        then mkPyPiSource spec
-        else if spec.type == "Channel" then
+        else if spec.type == "Channel"
-          mkChannelSource spec
+        then mkChannelSource spec
-        else if spec.type == "Tarball" then
+        else if spec.type == "Tarball"
-          mkTarballSource spec
+        then mkTarballSource spec
-        else
+        else builtins.throw "Unknown source type ${spec.type}";
-          builtins.throw "Unknown source type ${spec.type}";
     in
       spec // {outPath = mayOverride name path;};
 
-  mkGitSource =
+  mkGitSource = {
-    {
     repository,
     revision,
     url ? null,
@@ -79,32 +78,35 @@ let
     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
-    if url != null && !submodules then
+      if url != null && !submodules
+      then
         builtins.fetchTarball {
           inherit url;
           sha256 = hash; # FIXME: check nix version & use SRI hashes
         }
-    else
+      else let
-      let
         url =
-          if repository.type == "Git" then
+          if repository.type == "Git"
-            repository.url
+          then repository.url
-          else if repository.type == "GitHub" then
+          else if repository.type == "GitHub"
-            "https://github.com/${repository.owner}/${repository.repo}.git"
+          then "https://github.com/${repository.owner}/${repository.repo}.git"
-          else if repository.type == "GitLab" then
+          else if repository.type == "GitLab"
-            "${repository.server}/${repository.repo_path}.git"
+          then "${repository.server}/${repository.repo_path}.git"
-          else
+          else throw "Unrecognized repository type ${repository.type}";
-            throw "Unrecognized repository type ${repository.type}";
+        urlToName = url: rev: let
-        urlToName =
-          url: rev:
-          let
           matched = builtins.match "^.*/([^/]*)(\\.git)?$" url;
 
           short = builtins.substring 0 7 rev;
 
-            appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
+          appendShort =
-          in
+            if (builtins.match "[a-f0-9]*" rev) != null
-          "${if matched == null then "source" else builtins.head matched}${appendShort}";
+            then "-${short}"
+            else "";
+        in "${
+          if matched == null
+          then "source"
+          else builtins.head matched
+        }${appendShort}";
         name = urlToName url revision;
       in
         builtins.fetchGit {
@@ -114,22 +116,27 @@ let
           inherit url submodules;
         };
 
-  mkPyPiSource =
+  mkPyPiSource = {
-    { url, hash, ... }:
+    url,
+    hash,
+    ...
+  }:
     builtins.fetchurl {
       inherit url;
       sha256 = hash;
     };
 
-  mkChannelSource =
+  mkChannelSource = {
-    { url, hash, ... }:
+    url,
+    hash,
+    ...
+  }:
     builtins.fetchTarball {
       inherit url;
       sha256 = hash;
     };
 
-  mkTarballSource =
+  mkTarballSource = {
-    {
     url,
     locked_url ? url,
     hash,
@@ -140,7 +147,6 @@ let
       sha256 = hash;
     };
 in
-if version == 5 then
+  if version == 5
-  builtins.mapAttrs mkSource data.pins
+  then builtins.mapAttrs mkSource data.pins
-else
+  else throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
-  throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"