gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top-level: use parentheses to group checks

Browse Source 
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
      ;
This commit is contained in:
Matt Sturgeon
2025-10-24 07:15:22 +01:00
parent cab0f8f3a1
commit e92214c3a4
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/top-level/default.nix
View File

@@ -79,17 +79,16 @@ let
inherit (lib) throwIfNot; inherit (lib) throwIfNot;
checked = checked =
throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
(x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (lib.foldr (
(r: r) x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions."
overlays ) lib.id overlays)
throwIfNot (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
(lib.isList crossOverlays) (
"The crossOverlays argument to nixpkgs must be a list." lib.foldr (
lib.foldr x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions."
(x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") ) lib.id crossOverlays
(r: r) );
crossOverlays;
localSystem = lib.systems.elaborate args.localSystem; localSystem = lib.systems.elaborate args.localSystem;