From cf73196411928e1dfc6784a8a1c67a467533af4c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Dec 2021 12:52:06 +0100 Subject: [PATCH] nixpkgs: Check overlays types This seems to be a common mistake and is worth checking so we can provide a better error message. --- pkgs/top-level/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 10cf36d4d13e..10d0c79b2129 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,6 +49,15 @@ let # Rename the function arguments in let lib = import ../../lib; + throwIfNot = b: msg: if b then x: x else throw msg; + + 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 + ; + localSystem = lib.systems.elaborate args.localSystem; # Condition preserves sharing which in turn affects equality. @@ -121,4 +130,4 @@ in let pkgs = boot stages; -in pkgs +in checked pkgs