From aa122cbae78ce97d60c0c98ba14df753d97e40b1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo 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 Reviewed-by: lukegb Reviewed-by: wpcarro Reviewed-by: Profpatsch Reviewed-by: kanepyork Reviewed-by: tazjin Reviewed-by: cynthia Reviewed-by: edef Reviewed-by: eta Reviewed-by: grfn --- fun/owothia/default.nix | 5 +++-- fun/owothia/pkg.nix | 26 ++++++++++++++++++++++---- fun/owothia/shell.nix | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) (limited to 'fun/owothia') 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) -- cgit 1.4.1