Skip to content

flake/nixosSystem: pass the final lib to eval-config.nix #160459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ncfavier wants to merge 2 commits into from
Closed

flake/nixosSystem: pass the final lib to eval-config.nix #160459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc815bd
flake/nixosSystem: pass the final lib to eval-config.nix
ncfavier Jan 27, 2022
73031b6
lib.makeExtensible: make the extender available in the fixed point
ncfavier Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
nixos = import ./nixos/lib { lib = final; };

nixosSystem = args:
import ./nixos/lib/eval-config.nix (args // {
import ./nixos/lib/eval-config.nix ({ lib = final; } // args // {
modules = args.modules ++ [ {
system.nixos.versionSuffix =
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
Expand Down
9 changes: 6 additions & 3 deletions lib/fixed-points.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ rec {
# Same as `makeExtensible` but the name of the extending attribute is
# customized.
makeExtensibleWithCustomName = extenderName: rattrs:
fix' rattrs // {
${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
};
let
self = rattrs self // {
${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
__unfix__ = rattrs; # TODO: remove this?
};
in self;
}