nixfmt

docker/minica.nix

@@ -14,9 +14,7 @@ let
 
       contents = [ pkg ];
 
-      config = {
-        Cmd = [ "/bin/${pkg.name}" ];
-      };
+      config = { Cmd = [ "/bin/${pkg.name}" ]; };
     };
 
 in dockerImage minica

docker/moonplus.nix

@@ -14,9 +14,7 @@ let
 
       contents = [ pkg ];
 
-      config = {
-        Cmd = [ "/bin/${pkg.name}" ];
-      };
+      config = { Cmd = [ "/bin/${pkg.name}" ]; };
     };
 
 in dockerImage moonplus

nix/sources.nix

@@ -19,29 +19,28 @@ let
       pkgs.fetchzip { inherit (spec) url sha256; };
 
   fetch_git = spec:
-    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+    builtins.fetchGit {
+      url = spec.repo;
+      inherit (spec) rev ref;
+    };
 
   fetch_builtin-tarball = spec:
-    builtins.trace
-      ''
+    builtins.trace ''
       WARNING:
         The niv type "builtin-tarball" will soon be deprecated. You should
         instead use `builtin = true`.
 
         $ niv modify <package> -a type=tarball -a builtin=true
-      ''
-      builtins_fetchTarball { inherit (spec) url sha256; };
+    '' builtins_fetchTarball { inherit (spec) url sha256; };
 
   fetch_builtin-url = spec:
-    builtins.trace
-      ''
+    builtins.trace ''
       WARNING:
         The niv type "builtin-url" will soon be deprecated. You should
         instead use `builtin = true`.
 
         $ niv modify <package> -a type=file -a builtin=true
-      ''
-      (builtins_fetchurl { inherit (spec) url sha256; });
+    '' (builtins_fetchurl { inherit (spec) url sha256; });
 
   #
   # Various helpers
@@ -51,17 +50,16 @@ let
   mkPkgs = sources:
     let
       sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; })
+        { };
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
+    in if builtins.hasAttr "nixpkgs" sources then
+      sourcesNixpkgs
+    else if hasNixpkgsPath && !hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
     else
-        abort
-          ''
+      abort ''
         Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
         add a package called "nixpkgs" to your sources.json.
       '';
@@ -69,66 +67,67 @@ let
   # The actual fetching function.
   fetch = pkgs: name: spec:
 
-    if ! builtins.hasAttr "type" spec then
+    if !builtins.hasAttr "type" spec then
       abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs spec
-    else if spec.type == "tarball" then fetch_tarball pkgs spec
-    else if spec.type == "git" then fetch_git spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
-    else if spec.type == "builtin-url" then fetch_builtin-url spec
+    else if spec.type == "file" then
+      fetch_file pkgs spec
+    else if spec.type == "tarball" then
+      fetch_tarball pkgs spec
+    else if spec.type == "git" then
+      fetch_git spec
+    else if spec.type == "builtin-tarball" then
+      fetch_builtin-tarball spec
+    else if spec.type == "builtin-url" then
+      fetch_builtin-url spec
     else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+      abort
+      "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
 
   # Ports of functions for older nix versions
 
   # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
+  mapAttrs = builtins.mapAttrs or (f: set:
+    with builtins;
+    listToAttrs (map (attr: {
+      name = attr;
+      value = f attr set.${attr};
+    }) (attrNames set)));
 
   # fetchTarball version that is compatible between all the versions of Nix
   builtins_fetchTarball = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
+    let inherit (builtins) lessThan nixVersion fetchTarball;
+    in if lessThan nixVersion "1.12" then
       fetchTarball { inherit url; }
     else
       fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
   builtins_fetchurl = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
+    let inherit (builtins) lessThan nixVersion fetchurl;
+    in if lessThan nixVersion "1.12" then
       fetchurl { inherit url; }
     else
       fetchurl attrs;
 
   # Create the final "sources" from the config
   mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
+    mapAttrs (name: spec:
+      if builtins.hasAttr "outPath" spec then
+        abort
         "The values in sources.json should not have an 'outPath' attribute"
       else
-          spec // { outPath = fetch config.pkgs name spec; }
-    ) config.sources;
+        spec // { outPath = fetch config.pkgs name spec; }) config.sources;
 
   # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? ./sources.json
+  mkConfig = { sourcesFile ? ./sources.json
     , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
-    , pkgs ? mkPkgs sources
-    }: rec {
+    , pkgs ? mkPkgs sources }: rec {
       # The sources, i.e. the attribute set of spec name to spec
       inherit sources;
 
       # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
       inherit pkgs;
     };
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+in mkSources (mkConfig { }) // {
+  __functor = _: settings: mkSources (mkConfig settings);
+}

pkgs/moonplus/default.nix

@@ -1,9 +1,9 @@
-{ sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> {} }:
+{ sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> { } }:
 with pkgs;
 let
   defaultAttrs = {
     builder = ./builder.sh;
-    baseInputs = [];
+    baseInputs = [ ];
     src = sources.MoonPlus;
     version = "HEAD";
     name = "MoonPlus";

pkgs/srcNoTarget.nix

@@ -1,4 +1,3 @@
 dir:
 builtins.filterSource
-  (path: type: type != "directory" || builtins.baseNameOf path != "target")
-  dir
+(path: type: type != "directory" || builtins.baseNameOf path != "target") dir

pkgs/x/default.nix

@@ -14,7 +14,7 @@ let
     };
 
     modSha256 = "sha256-mTzZcEoag1/1IAZCSY7MLgNS+lI453GM8SM1aFVLKUU=";
-    CGO_ENABLED="0";
+    CGO_ENABLED = "0";
 
     allowGoReference = true;
 
@@ -50,8 +50,7 @@ let
     '';
   };
 
-in
-{
+in {
   appsluggr = out.appsluggr;
   quickserv = out.quickserv;
   johaus = out.johaus;

pkgs/zig.nix

@@ -1,4 +1,4 @@
-{pkgs ? import <nixpkgs> {}}:
+{ pkgs ? import <nixpkgs> { } }:
 
 version: shasums: