From 1c2ff72eb141f04986cf1f85daabbcee45accd20 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 15 Mar 2020 09:24:55 -0400 Subject: [PATCH] nixfmt --- docker/minica.nix | 4 +- docker/moonplus.nix | 4 +- nix/sources.nix | 135 +++++++++++++++++++------------------- pkgs/moonplus/default.nix | 4 +- pkgs/srcNoTarget.nix | 3 +- pkgs/x/default.nix | 17 +++-- pkgs/zig.nix | 2 +- 7 files changed, 81 insertions(+), 88 deletions(-) diff --git a/docker/minica.nix b/docker/minica.nix index 9b46c78..53a9a7e 100644 --- a/docker/minica.nix +++ b/docker/minica.nix @@ -14,9 +14,7 @@ let contents = [ pkg ]; - config = { - Cmd = [ "/bin/${pkg.name}" ]; - }; + config = { Cmd = [ "/bin/${pkg.name}" ]; }; }; in dockerImage minica diff --git a/docker/moonplus.nix b/docker/moonplus.nix index 3533db4..371c59d 100644 --- a/docker/moonplus.nix +++ b/docker/moonplus.nix @@ -14,9 +14,7 @@ let contents = [ pkg ]; - config = { - Cmd = [ "/bin/${pkg.name}" ]; - }; + config = { Cmd = [ "/bin/${pkg.name}" ]; }; }; in dockerImage moonplus diff --git a/nix/sources.nix b/nix/sources.nix index 0ad45ef..c73f3f6 100644 --- a/nix/sources.nix +++ b/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 - '' - WARNING: - The niv type "builtin-tarball" will soon be deprecated. You should - instead use `builtin = true`. + builtins.trace '' + WARNING: + The niv type "builtin-tarball" will soon be deprecated. You should + instead use `builtin = true`. - $ niv modify -a type=tarball -a builtin=true - '' - builtins_fetchTarball { inherit (spec) url sha256; }; + $ niv modify -a type=tarball -a builtin=true + '' builtins_fetchTarball { inherit (spec) url sha256; }; fetch_builtin-url = spec: - builtins.trace - '' - WARNING: - The niv type "builtin-url" will soon be deprecated. You should - instead use `builtin = true`. + builtins.trace '' + WARNING: + The niv type "builtin-url" will soon be deprecated. You should + instead use `builtin = true`. - $ niv modify -a type=file -a builtin=true - '' - (builtins_fetchurl { inherit (spec) url sha256; }); + $ niv modify -a type=file -a builtin=true + '' (builtins_fetchurl { inherit (spec) url sha256; }); # # Various helpers @@ -51,84 +50,84 @@ 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 = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import {} - else - abort - '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; + in if builtins.hasAttr "nixpkgs" sources then + sourcesNixpkgs + else if hasNixpkgsPath && !hasThisAsNixpkgsPath then + import { } + else + abort '' + Please specify either (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; # 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 - fetchTarball { inherit url; } - else - fetchTarball attrs; + 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 - fetchurl { inherit url; } - else - fetchurl attrs; + 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 - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = fetch config.pkgs name spec; } - ) config.sources; + 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; # 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); +} diff --git a/pkgs/moonplus/default.nix b/pkgs/moonplus/default.nix index 19c3432..d65d629 100644 --- a/pkgs/moonplus/default.nix +++ b/pkgs/moonplus/default.nix @@ -1,9 +1,9 @@ -{ sources ? import ../../nix/sources.nix, pkgs ? import {} }: +{ sources ? import ../../nix/sources.nix, pkgs ? import { } }: with pkgs; let defaultAttrs = { builder = ./builder.sh; - baseInputs = []; + baseInputs = [ ]; src = sources.MoonPlus; version = "HEAD"; name = "MoonPlus"; diff --git a/pkgs/srcNoTarget.nix b/pkgs/srcNoTarget.nix index 7c9aaa2..82accbf 100644 --- a/pkgs/srcNoTarget.nix +++ b/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 diff --git a/pkgs/x/default.nix b/pkgs/x/default.nix index c9db829..76f4245 100644 --- a/pkgs/x/default.nix +++ b/pkgs/x/default.nix @@ -14,17 +14,17 @@ let }; modSha256 = "sha256-mTzZcEoag1/1IAZCSY7MLgNS+lI453GM8SM1aFVLKUU="; - CGO_ENABLED="0"; + CGO_ENABLED = "0"; allowGoReference = true; subPackages = [ - "cmd/appsluggr" - "cmd/johaus" - "cmd/license" - "cmd/mainsanow" - "cmd/prefix" - "cmd/quickserv" + "cmd/appsluggr" + "cmd/johaus" + "cmd/license" + "cmd/mainsanow" + "cmd/prefix" + "cmd/quickserv" ]; outputs = [ @@ -50,8 +50,7 @@ let ''; }; -in -{ +in { appsluggr = out.appsluggr; quickserv = out.quickserv; johaus = out.johaus; diff --git a/pkgs/zig.nix b/pkgs/zig.nix index 1131b16..86dce34 100644 --- a/pkgs/zig.nix +++ b/pkgs/zig.nix @@ -1,4 +1,4 @@ -{pkgs ? import {}}: +{ pkgs ? import { } }: version: shasums: