From 321006d2d98fb4c8ed73075f5d97650db57af528 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Fri, 24 Oct 2025 07:19:22 +0100 Subject: [PATCH] top-level: simplify `checked` using `lib.all` --- pkgs/top-level/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 421e0299e2d8..ecfef757909e 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -80,14 +80,10 @@ let 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." - ) lib.id overlays) + (throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.") (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 + throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions." ); localSystem = lib.systems.elaborate args.localSystem;