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>
---
 users/wpcarro/utils/builder.nix | 3 ++-
 users/wpcarro/utils/default.nix | 5 +++--
 users/wpcarro/utils/fs.nix      | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'users/wpcarro/utils')

diff --git a/users/wpcarro/utils/builder.nix b/users/wpcarro/utils/builder.nix
index 45e783cf0ba8..2bc061d3661b 100644
--- a/users/wpcarro/utils/builder.nix
+++ b/users/wpcarro/utils/builder.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (pkgs) writeShellScriptBin;
-in {
+in
+{
   # Create a derivation that creates an executable shell script named `as` that
   # calls the program located at `path`, forwarding all of the arguments.
   wrapNonNixProgram = { path, as }: writeShellScriptBin as ''
diff --git a/users/wpcarro/utils/default.nix b/users/wpcarro/utils/default.nix
index 59aa322076b4..46d30acfa24e 100644
--- a/users/wpcarro/utils/default.nix
+++ b/users/wpcarro/utils/default.nix
@@ -8,7 +8,8 @@ args@{ pkgs, ... }:
 
 let
   builder = import ./builder.nix args;
-  fs      = import ./fs.nix args;
-in {
+  fs = import ./fs.nix args;
+in
+{
   inherit builder fs;
 }
diff --git a/users/wpcarro/utils/fs.nix b/users/wpcarro/utils/fs.nix
index 6305e705b141..d7d5e34e991b 100644
--- a/users/wpcarro/utils/fs.nix
+++ b/users/wpcarro/utils/fs.nix
@@ -5,7 +5,8 @@
 let
   inherit (builtins) attrNames hasAttr map readDir;
   inherit (pkgs.lib) filterAttrs;
-in {
+in
+{
   # Returns a list of all of the regular files in `dir`.
   files = dir:
     map (name: dir + "/${name}")
@@ -31,11 +32,11 @@ in {
     if hasAttr name (readDir dir) then
       dir + "/${name}"
     else
-      # This prevents the function from infinitely recursing and eventually
-      # stack overflowing.
+    # This prevents the function from infinitely recursing and eventually
+    # stack overflowing.
       if (dirOf dir) == dir then
         null
       else
         resolve name (dirOf dir);
-  };
+};
 }
-- 
cgit 1.4.1