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

mkFlake: update to new fup outputsBuilder

This commit is contained in:
Pacman99 2021-05-19 08:51:20 -07:00 committed by Parthiv Seetharaman
parent 7daa4d45b1
commit a3c6bc7990

View File

@ -83,21 +83,29 @@ lib.systemFlake (lib.mergeAny
inherit (self) pkgs;
};
packagesBuilder = lib.exporters.fromOverlays self.overlays;
outputsBuilder = channels:
let
defaultChannel = channels.${cfg.nixos.hostDefaults.channelName};
in
lib.mergeAny
{
packages = lib.exporters.fromOverlays self.overlays channels;
checksBuilder = channels:
lib.pkgs-lib.tests.mkChecks {
pkgs = getDefaultChannel channels;
inherit (self.deploy) nodes;
hosts = self.nixosConfigurations;
homes = self.homeConfigurations or { };
};
checks = lib.pkgs-lib.tests.mkChecks {
pkgs = defaultChannel;
inherit (self.deploy) nodes;
hosts = self.nixosConfigurations;
homes = self.homeConfigurations or { };
};
devShell = lib.pkgs-lib.shell {
pkgs = defaultChannel;
extraModules = cfg.devshellModules;
};
}
(otherArguments.outputsBuilder channels);
devShellBuilder = channels:
lib.pkgs-lib.shell {
pkgs = getDefaultChannel channels;
extraModules = cfg.devshellModules;
};
}
otherArguments # for overlays list order
)