From 0fb4ae72c5754761fd7666e4274f4beef0484c32 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 2 Jan 2025 16:20:21 -0500
Subject: Switch to alejandra for nix formatting

I mostly wanted a formatter that would format `inherit` blocks
vertically, because otherwise they are super hard to read when diffing
or even just editing.  Both alejandra and the new nixos/nixfmt format
verically like this, but alejandra has slightly better format (I guess)
and for some reason nixfmt did not respect my `GLOBIGNORE` setting when
doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and
failed. So anyway I went with alejandra.

- https://github.com/kamadorueda/alejandra
- https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506
---
 Omni/Bild/Haskell.nix | 61 ++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

(limited to 'Omni/Bild/Haskell.nix')

diff --git a/Omni/Bild/Haskell.nix b/Omni/Bild/Haskell.nix
index 764ef5d..7e969da 100644
--- a/Omni/Bild/Haskell.nix
+++ b/Omni/Bild/Haskell.nix
@@ -1,37 +1,38 @@
-_self: super:
-
-let
+_self: super: let
   inherit (import ./Constants.nix) ghcCompiler;
 
-  buildCabal = sel: name: sel.callCabal2nix name super.sources.${name} { };
-
+  buildCabal = sel: name: sel.callCabal2nix name super.sources.${name} {};
 in rec {
-
-  haskell = super.haskell // {
-    packages = super.haskell.packages // {
-      "${ghcCompiler}" = super.haskell.packages."${ghcCompiler}".override
-        (_old: {
-          overrides = with super.pkgs.haskell.lib;
-            sel: sup:
-            super.overridePinnedDeps (buildCabal sel) // {
-              ap-normalize = dontCheck sup.ap-normalize;
-              clay = doJailbreak sup.clay;
-              cmark = doJailbreak sup.cmark;
-              docopt = buildCabal sel "docopt";
-              filelock = dontCheck sup.filelock;
-              linear-generics = doJailbreak sup.linear-generics;
-              req = doJailbreak sup.req;
-              servant-auth = doJailbreak sup.servant-auth;
-              servant-auth-server = dontCheck sup.servant-auth-server;
-              shellcheck = doJailbreak sup.shellcheck;
-              string-qq = doJailbreak sup.string-qq;
-              syb-with-class = doJailbreak sup.syb-with-class;
-              th-abstraction = doJailbreak sup.th-abstraction;
-            };
-        });
+  haskell =
+    super.haskell
+    // {
+      packages =
+        super.haskell.packages
+        // {
+          "${ghcCompiler}" =
+            super.haskell.packages."${ghcCompiler}".override
+            (_old: {
+              overrides = with super.pkgs.haskell.lib;
+                sel: sup:
+                  super.overridePinnedDeps (buildCabal sel)
+                  // {
+                    ap-normalize = dontCheck sup.ap-normalize;
+                    clay = doJailbreak sup.clay;
+                    cmark = doJailbreak sup.cmark;
+                    docopt = buildCabal sel "docopt";
+                    filelock = dontCheck sup.filelock;
+                    linear-generics = doJailbreak sup.linear-generics;
+                    req = doJailbreak sup.req;
+                    servant-auth = doJailbreak sup.servant-auth;
+                    servant-auth-server = dontCheck sup.servant-auth-server;
+                    shellcheck = doJailbreak sup.shellcheck;
+                    string-qq = doJailbreak sup.string-qq;
+                    syb-with-class = doJailbreak sup.syb-with-class;
+                    th-abstraction = doJailbreak sup.th-abstraction;
+                  };
+            });
+        };
     };
-  };
 
   ormolu = super.haskellPackages.ormolu;
-
 }
-- 
cgit v1.2.3