1
1
mirror of https://github.com/divnix/digga.git synced 2024-12-23 08:02:21 +03:00

fix: boostrap iso module

This commit is contained in:
David Arnold 2021-07-20 20:58:03 -05:00 committed by Parthiv Seetharaman
parent fee8829dd7
commit 13d6f8590f
7 changed files with 92 additions and 82 deletions

View File

@ -2,7 +2,7 @@
with lib;
lib.runTests {
testRakeLeaves = {
expr = importers.rakeLeaves ./profiles;
expr = rakeLeaves ./profiles;
expected = {
f = ./profiles/f.nix;
foo = ./profiles/foo;
@ -13,7 +13,7 @@ lib.runTests {
};
testFlattenTree = {
expr = importers.flattenTree (importers.rakeLeaves ./profiles);
expr = flattenTree (rakeLeaves ./profiles);
expected = {
f = ./profiles/f.nix;
foo = ./profiles/foo;

View File

@ -7,7 +7,7 @@ let
digga = inputs.digga;
pkgs = import nixpkgs { inherit system; config = { }; overlays = [ ]; };
docOptions = (digga.lib.mkFlake { self = {}; inputs = {};}).options;
docOptions = (digga.lib.mkFlake { self = { }; inputs = { }; }).options;
evaledOptions = (pkgs.lib.evalModules { modules = [ docOptions ]; }).options;
mkDocPartMd = part: title: intro:

View File

@ -1,5 +1,5 @@
{ self, fullHostConfig }:
{ config, lib, modulesPath, suites, ... }@args: {
let
protoModule = fullHostConfig: { config, lib, modulesPath, suites, self, ... }@args: {
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" ];
# avoid unwanted systemd service startups
@ -74,5 +74,14 @@
'';
};
};
};
in
{ config, ... }:
{
system.build = {
boostrapIso = (config.lib.digga.mkBuild
(protoModule config)
).config.system.build.isoImage;
};
}

View File

@ -1,4 +1,4 @@
{
nixConfig = import ./nix-config.nix;
bootstapIso = import ./boostrap-iso.nix;
bootstrapIso = import ./boostrap-iso.nix;
}

View File

@ -144,7 +144,7 @@ devshell.mkShell {
(test "examples" "groupByConfig")
(test "examples" "hmOnly")
(test "examples" "all" // { command = "check-downstream && check-groupByConfig && check-hmOnly"; })
(docs { package = pkgs.mdbook;})
(docs { package = pkgs.mdbook; })
(docs makeDocs)
];

View File

@ -15,7 +15,8 @@ let
extraArgs = removeAttrs args (builtins.attrNames evaled.options);
in {
in
{
__functor = _: fupAdapter' {
inherit (evaled) config;

View File

@ -239,7 +239,7 @@ let
Example:
```
importables = rec {
profiles = digga.lib.importers.rakeLeaves ./profiles;
profiles = digga.lib.rakeLeaves ./profiles;
suites = with profiles; { };
}
```