From e92214c3a47111a34063c474d92a210372e9e8bf Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Fri, 24 Oct 2025 07:15:22 +0100 Subject: [PATCH] top-level: use parentheses to group checks Group `throwIfNot` chains with parentheses to improve readability and hint to nixfmt the intended formatting. This makes the result visually closer to the pre-nixfmt layout: checked = throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list." lib.foldr (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") (r: r) crossOverlays ; --- pkgs/top-level/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 12329d0af82f..421e0299e2d8 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -79,17 +79,16 @@ let inherit (lib) throwIfNot; checked = - throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr - (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") - (r: r) - overlays - throwIfNot - (lib.isList crossOverlays) - "The crossOverlays argument to nixpkgs must be a list." - lib.foldr - (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") - (r: r) - crossOverlays; + (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.") + (lib.foldr ( + x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions." + ) lib.id overlays) + (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.") + ( + lib.foldr ( + x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions." + ) lib.id crossOverlays + ); localSystem = lib.systems.elaborate args.localSystem;