|
|
@ -21,35 +21,13 @@ |
|
|
|
|
|
|
|
|
|
|
|
nixos = import ./nixos/lib { lib = final; }; |
|
|
|
nixos = import ./nixos/lib { lib = final; }; |
|
|
|
|
|
|
|
|
|
|
|
nixosSystem = { modules, ... } @ args: |
|
|
|
nixosSystem = args: |
|
|
|
import ./nixos/lib/eval-config.nix (args // { |
|
|
|
import ./nixos/lib/eval-config.nix (args // { |
|
|
|
modules = |
|
|
|
modules = args.modules ++ [ { |
|
|
|
let |
|
|
|
system.nixos.versionSuffix = |
|
|
|
moduleDeclarationFile = |
|
|
|
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; |
|
|
|
let |
|
|
|
system.nixos.revision = final.mkIf (self ? rev) self.rev; |
|
|
|
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't |
|
|
|
} ]; |
|
|
|
# mean that the evaluator always keeps track of its position. If there |
|
|
|
|
|
|
|
# are too many levels of indirection, the position gets lost at some point. |
|
|
|
|
|
|
|
intermediatePos = builtins.unsafeGetAttrPos "modules" args; |
|
|
|
|
|
|
|
in |
|
|
|
|
|
|
|
if intermediatePos == null then null else intermediatePos.file; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Add the invoking file as error message location for modules |
|
|
|
|
|
|
|
# that don't have their own locations; presumably inline modules. |
|
|
|
|
|
|
|
addModuleDeclarationFile = |
|
|
|
|
|
|
|
m: if moduleDeclarationFile == null then m else { |
|
|
|
|
|
|
|
_file = moduleDeclarationFile; |
|
|
|
|
|
|
|
imports = [ m ]; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in |
|
|
|
|
|
|
|
map addModuleDeclarationFile modules ++ [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
system.nixos.versionSuffix = |
|
|
|
|
|
|
|
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; |
|
|
|
|
|
|
|
system.nixos.revision = final.mkIf (self ? rev) self.rev; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
]; |
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|