public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: simple refactor to get rid of pos'

Browse Source 
Suggested by Ericson2314.
This commit is contained in:
Vladimír Čunát 2017-01-29 22:12:41 +01:00 committed by John Ericson
parent 7fdf18e892
commit 5afcdc88fa
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/stdenv/generic/default.nix
View File

@ -135,7 +135,10 @@ let
, crossConfig ? null , crossConfig ? null
, meta ? {} , meta ? {}
, passthru ? {} , passthru ? {}
, pos ? null # position used in error messages and for meta.position , pos ? # position used in error messages and for meta.position
(if attrs.meta.description or null != null
then builtins.unsafeGetAttrPos "description" attrs.meta
else builtins.unsafeGetAttrPos "name" attrs)
, separateDebugInfo ? false , separateDebugInfo ? false
, outputs ? [ "out" ] , outputs ? [ "out" ]
, __impureHostDeps ? [] , __impureHostDeps ? []
@ -153,15 +156,7 @@ let
(map (drv: drv.crossDrv or drv) propagatedBuildInputs) (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
]; ];
in let in let
pos' = pos_str = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
if pos != null then
pos
else if attrs.meta.description or null != null then
builtins.unsafeGetAttrPos "description" attrs.meta
else
builtins.unsafeGetAttrPos "name" attrs;
pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»";
remediation = { remediation = {
unfree = remediate_whitelist "Unfree"; unfree = remediate_whitelist "Unfree";
@ -216,7 +211,7 @@ let
throwEvalHelp = { reason , errormsg ? "" }: throwEvalHelp = { reason , errormsg ? "" }:
throw ('' throw (''
Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate. Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
'' + ((builtins.getAttr reason remediation) attrs)); '' + ((builtins.getAttr reason remediation) attrs));
@ -293,7 +288,7 @@ let
# Throw an error if trying to evaluate an non-valid derivation # Throw an error if trying to evaluate an non-valid derivation
validityCondition = validityCondition =
let v = checkValidity attrs; let v = checkValidity attrs;
in if !v.valid in if !v.valid
then throwEvalHelp (removeAttrs v ["valid"]) then throwEvalHelp (removeAttrs v ["valid"])
else true; else true;
@ -364,8 +359,8 @@ let
} }
// attrs.meta or {} // attrs.meta or {}
# Fill `meta.position` to identify the source location of the package. # Fill `meta.position` to identify the source location of the package.
// lib.optionalAttrs (pos' != null) // lib.optionalAttrs (pos != null)
{ position = pos'.file + ":" + toString pos'.line; } { position = pos.file + ":" + toString pos.line; }
; ;
in in