From aa122cbae78ce97d60c0c98ba14df753d97e40b1 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 30 Jan 2022 19:06:58 +0300
Subject: style: format entire depot with nixpkgs-fmt

This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
---
 fun/gemma/default.nix                          |  3 ++-
 fun/idual/default.nix                          | 11 ++++++-----
 fun/owothia/default.nix                        |  5 +++--
 fun/owothia/pkg.nix                            | 26 ++++++++++++++++++++++----
 fun/owothia/shell.nix                          |  2 +-
 fun/uggc/default.nix                           |  3 ++-
 "fun/\360\237\225\260\357\270\217/default.nix" |  3 ++-
 7 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'fun')

diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix
index 0b5e67b159..4a26005852 100644
--- a/fun/gemma/default.nix
+++ b/fun/gemma/default.nix
@@ -33,7 +33,8 @@ let
       cp ${frontend} $out/index.html
     ''}/")
   '';
-in depot.nix.buildLisp.program {
+in
+depot.nix.buildLisp.program {
   name = "gemma";
 
   deps = with depot.third_party.lisp; [
diff --git a/fun/idual/default.nix b/fun/idual/default.nix
index 0f87f4ae1a..1acf287bfb 100644
--- a/fun/idual/default.nix
+++ b/fun/idual/default.nix
@@ -4,19 +4,20 @@ let
   inherit (pkgs) python3 python3Packages;
 
   opts = {
-    pname   = "idualctl";
+    pname = "idualctl";
     version = "0.1";
-    src     = ./.;
+    src = ./.;
 
     propagatedBuildInputs = [
       depot.third_party.python.broadlink
     ];
   };
   package = python3Packages.buildPythonPackage opts;
-  script  = python3Packages.buildPythonApplication opts;
-in depot.nix.readTree.drvTargets {
+  script = python3Packages.buildPythonApplication opts;
+in
+depot.nix.readTree.drvTargets {
   inherit script;
-  python  = python3.withPackages (_: [ package ]);
+  python = python3.withPackages (_: [ package ]);
   setAlarm = pkgs.writeShellScriptBin "set-alarm" ''
     echo "setting an alarm for ''${1}"
     ${pkgs.systemd}/bin/systemd-run --user --on-calendar="''${1} Europe/London" --unit=light-alarm.service
diff --git a/fun/owothia/default.nix b/fun/owothia/default.nix
index b70d0525c1..04f98e97fb 100644
--- a/fun/owothia/default.nix
+++ b/fun/owothia/default.nix
@@ -1,6 +1,7 @@
-{ depot ? (import ../../../. {})
+{ depot ? (import ../../../. { })
 , pkgs ? depot.third_party.nixpkgs
-, ... }:
+, ...
+}:
 
 let
   basePkg = pkgs.haskellPackages.callPackage ./pkg.nix { };
diff --git a/fun/owothia/pkg.nix b/fun/owothia/pkg.nix
index d0941a8489..c812e5e116 100644
--- a/fun/owothia/pkg.nix
+++ b/fun/owothia/pkg.nix
@@ -1,5 +1,15 @@
-{ mkDerivation, base, bytestring, chatter, containers, envy
-, irc-client, lens, lib, random, relude, text
+{ mkDerivation
+, base
+, bytestring
+, chatter
+, containers
+, envy
+, irc-client
+, lens
+, lib
+, random
+, relude
+, text
 }:
 mkDerivation {
   pname = "owothia";
@@ -8,8 +18,16 @@ mkDerivation {
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    base bytestring chatter containers envy irc-client lens random
-    relude text
+    base
+    bytestring
+    chatter
+    containers
+    envy
+    irc-client
+    lens
+    random
+    relude
+    text
   ];
   license = "unknown";
   hydraPlatforms = lib.platforms.none;
diff --git a/fun/owothia/shell.nix b/fun/owothia/shell.nix
index 1ad70c907b..0304581d9d 100644
--- a/fun/owothia/shell.nix
+++ b/fun/owothia/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs ? (import ../../../. {}).third_party, ... }:
+{ pkgs ? (import ../../../. { }).third_party, ... }:
 
 let
   inherit (pkgs)
diff --git a/fun/uggc/default.nix b/fun/uggc/default.nix
index ca622666dc..980ad16bcc 100644
--- a/fun/uggc/default.nix
+++ b/fun/uggc/default.nix
@@ -12,7 +12,8 @@ let
       gopkgs."github.com".pkg.browser.gopkg
     ];
   };
-in uggc.overrideAttrs(old: {
+in
+uggc.overrideAttrs (old: {
   buildCommand = old.buildCommand + ''
     install -D ${./uggc.desktop} $out/share/applications/uggc.desktop
     sed "s|@out@|$out|g" -i $out/share/applications/uggc.desktop
diff --git "a/fun/\360\237\225\260\357\270\217/default.nix" "b/fun/\360\237\225\260\357\270\217/default.nix"
index 230d9f02f1..2b1a946400 100644
--- "a/fun/\360\237\225\260\357\270\217/default.nix"
+++ "b/fun/\360\237\225\260\357\270\217/default.nix"
@@ -38,6 +38,7 @@ let
       "ecl" # refuses to create non-ASCII paths even on POSIX…
     ];
   };
-in bin // {
+in
+bin // {
   inherit lib;
 }
-- 
cgit 1.4.1