diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:05:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:09:15 +0200 |
| commit | 29901451700a7382f3f9d5a0a23cd55b187e5585 (patch) | |
| tree | 599bf9b4d98d71c07610deeb29baf5ceccfb40e5 /pkgs | |
| parent | 8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (diff) | |
| parent | 2c09066dfd1e9f332603993829e128a0261e9840 (diff) | |
| download | nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.gz nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.bz2 nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.lz nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.xz nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.zst nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.zip | |
remerge to retrieve refactoring lost 10 days ago
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 789bfe87f62..a27485e144d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -63,25 +63,16 @@ let && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) && !allowUnfreePredicate attrs then throw '' - Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set - { nixpkgs.config.allowUnfree = true; } - in configuration.nix to override this. If you use Nix standalone, you can add - { allowUnfree = true; } - to ~/.nixpkgs/config.nix.'' + Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. + ${forceEvalHelp "Unfree"}'' else if !allowBroken && attrs.meta.broken or false then - throw '' - Package ‘${attrs.name}’ in ${pos'} is marked as broken, refusing to evaluate. You can set - { nixpkgs.config.allowBroken = true; } - in configuration.nix to override this. If you use Nix standalone, you can add - { allowBroken = true; } - to ~/.nixpkgs/config.nix.'' + throw '' + Package ‘${attrs.name}’ in ${pos'} is marked as broken, refusing to evaluate. + ${forceEvalHelp "Broken"}'' else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - throw '' - Package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’, refusing to evaluate. You can set - { nixpkgs.config.allowBroken = true; } - in configuration.nix to override this. If you use Nix standalone, you can add - { allowBroken = true; } - to ~/.nixpkgs/config.nix.'' + throw '' + Package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’, refusing to evaluate. + ${forceEvalHelp "Broken"}'' else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) |