Simplify inherited attribute handling
This reduces the difference between inherited and non-inherited attribute handling to the choice of which env to use (in recs and lets) by setting the AttrDef::e to a new ExprVar in the parser rather than carrying a separate AttrDef::v VarRef member. As an added bonus, this allows inherited attributes that inherit from a with to delay forcing evaluation of the with's attributes. Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
6cd6ce5608
commit
afc6c1bad6
7 changed files with 46 additions and 38 deletions
24
tests/lang/eval-okay-delayed-with-inherit.nix
Normal file
24
tests/lang/eval-okay-delayed-with-inherit.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
let
|
||||
pkgs_ = with pkgs; {
|
||||
a = derivation {
|
||||
name = "a";
|
||||
system = builtins.currentSystem;
|
||||
builder = "/bin/sh";
|
||||
args = [ "-c" "touch $out" ];
|
||||
inherit b;
|
||||
};
|
||||
|
||||
inherit b;
|
||||
};
|
||||
|
||||
packageOverrides = p: {
|
||||
b = derivation {
|
||||
name = "b-overridden";
|
||||
system = builtins.currentSystem;
|
||||
builder = "/bin/sh";
|
||||
args = [ "-c" "touch $out" ];
|
||||
};
|
||||
};
|
||||
|
||||
pkgs = pkgs_ // (packageOverrides pkgs_);
|
||||
in pkgs.a.b.name
|
Loading…
Add table
Add a link
Reference in a new issue