lib.callPackageWith: Use abort, not throw
This reverts f8ea911f7c
, see also https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594
This commit is contained in:
parent
3e929146cf
commit
56df668386
1 changed files with 5 additions and 1 deletions
|
@ -203,7 +203,11 @@ rec {
|
||||||
|
|
||||||
in if missingArgs == {}
|
in if missingArgs == {}
|
||||||
then makeOverridable f allArgs
|
then makeOverridable f allArgs
|
||||||
else throw "lib.customisation.callPackageWith: ${error}";
|
# This needs to be an abort so it can't be caught with `builtins.tryEval`,
|
||||||
|
# which is used by nix-env and ofborg to filter out packages that don't evaluate.
|
||||||
|
# This way we're forced to fix such errors in Nixpkgs,
|
||||||
|
# which is especially relevant with allowAliases = false
|
||||||
|
else abort "lib.customisation.callPackageWith: ${error}";
|
||||||
|
|
||||||
|
|
||||||
/* Like callPackage, but for a function that returns an attribute
|
/* Like callPackage, but for a function that returns an attribute
|
||||||
|
|
Loading…
Reference in a new issue