Unverified Commit 266982a7 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

top-level: group throwIfNot checks and simplify (#455138)

parents 26c953d1 321006d2

pkgs/top-level/default.nix

+6 −11
Original line number Diff line number Diff line
@@ -79,17 +79,12 @@ 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.")

      (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.")

      (

        throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions."

      );



  localSystem = lib.systems.elaborate args.localSystem;