use lazy folds

tek · Aug 3, 2023 · a46bf25 · a46bf25
1 parent 1564ed3
commit a46bf25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -22,7 +22,7 @@ let
 
   mergeOverrides = zipAttrsWith (_: concatLists);
 
-  concatOverrides = foldl' (a: b: toList a ++ toList b) [];
+  concatOverrides = foldl (a: b: toList a ++ toList b) [];
 
   normalizeOverrides = project: deps: depsFull:
   let
@@ -48,7 +48,7 @@ let
   unlinesConcatMap = f: xs: concatStringsSep "\n" (concatMap f xs);
 
   foldAttrs =
-  foldl' lib.mergeAttrs {};
+  foldl lib.mergeAttrs {};
 
   foldMapAttrs = f: xs:
   foldAttrs (map f xs);
@@ -83,7 +83,7 @@ let
   else b;
 
   mergeAll' = z: items:
-  foldl' mergeAuto z items;
+  foldl mergeAuto z items;
 
   mergeAll = items:
   if length items == 0

diff --git a/lib/deps/cabal2nix.nix b/lib/deps/cabal2nix.nix
@@ -1,10 +1,9 @@
 {pkgs}: let
 
-  modifiers = import ./modifiers.nix { inherit pkgs; };
   spec = import ./spec.nix { inherit (pkgs) lib; };
   util = import ../default.nix { inherit (pkgs) lib; };
 
-  inherit (spec) transform transform_ decl;
+  inherit (spec) decl;
 
   hackageDrv = meta: {self, pkg, options, ...}:
   self.callHackageDirect { inherit (meta) ver sha256; inherit pkg; } (util.foldAttrs options.cabal2nix-overrides or []);