ref: adapt to using plain digga module for boostrap ISO

This commit is contained in:
David Arnold 2021-07-20 20:59:50 -05:00
parent dcb425341d
commit 31a8e76209
No known key found for this signature in database
GPG Key ID: AB15A6AF1101390D
3 changed files with 4 additions and 14 deletions

View File

@ -172,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1626826189, "lastModified": 1626835448,
"narHash": "sha256-Ao4zLLMvs0Q8mDMtTbi7JyUHZAPUkZpo1OArgKLTOzA=", "narHash": "sha256-qMZ4T0ig9bBHsiu1nEnYzI6JjXjpJv2fnBexpJ8cw+0=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "e97d0ec012df585529eefe0381e087d73261e76e", "rev": "372910fa131fdd51edc695b3eb2ce3992b905460",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -112,6 +112,7 @@
imports = [ (digga.lib.importModules ./modules) ]; imports = [ (digga.lib.importModules ./modules) ];
externalModules = [ externalModules = [
{ lib.our = self.lib; } { lib.our = self.lib; }
digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
ci-agent.nixosModules.agent-profile ci-agent.nixosModules.agent-profile
home.nixosModules.home-manager home.nixosModules.home-manager

View File

@ -1,11 +0,0 @@
{ lib, pkgs, self, config, modules, channel, ... }:
{
system.build = {
iso = (config.lib.digga.mkBuild
(config.lib.digga.modules.isoConfig {
inherit self;
fullHostConfig = config;
})
).config.system.build.isoImage;
};
}