forked from dan/liminix
merge-modules accepts >1 module
This commit is contained in:
parent
887a4ff966
commit
c6e56b1637
13
default.nix
13
default.nix
|
@ -4,15 +4,10 @@
|
|||
let
|
||||
overlay = import ./overlay.nix;
|
||||
nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; });
|
||||
baseConfig = {
|
||||
systemPackages = [];
|
||||
services = {};
|
||||
kernel = device.kernel;
|
||||
};
|
||||
config = baseConfig // (import <liminix-config>) {
|
||||
config = baseConfig;
|
||||
inherit (nixpkgs) pkgs;
|
||||
};
|
||||
config = (import ./merge-modules.nix) [
|
||||
(import ./modules/base.nix { inherit device; })
|
||||
<liminix-config>
|
||||
] nixpkgs.pkgs;
|
||||
finalConfig = config // {
|
||||
packages = (with nixpkgs.pkgs; [ s6-rc ]) ++
|
||||
config.systemPackages ++
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
module : initial : pkgs :
|
||||
modules : pkgs :
|
||||
let evalModules = (import <nixpkgs/lib>).evalModules;
|
||||
in evalModules {
|
||||
modules = [
|
||||
{ _module.args = { inherit pkgs; }; }
|
||||
module
|
||||
];
|
||||
}
|
||||
in (evalModules {
|
||||
modules =
|
||||
[
|
||||
{ _module.args = { inherit pkgs; lib = pkgs.lib; }; }
|
||||
] ++ modules;
|
||||
}).config
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
{ device } :
|
||||
{ lib, ...}:
|
||||
let inherit (lib) mkEnableOption mkOption types;
|
||||
in {
|
||||
options = {
|
||||
systemPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
};
|
||||
services = mkOption {
|
||||
type = types.anything;
|
||||
};
|
||||
kernel = mkOption {
|
||||
type = types.anything;
|
||||
default = { inherit (device.kernel) config checkedConfig; };
|
||||
};
|
||||
};
|
||||
}
|
|
@ -5,11 +5,11 @@ let
|
|||
inherit (nixpkgs) lib pkgs;
|
||||
inherit (lib.asserts) assertMsg;
|
||||
config =
|
||||
(import <liminix/merge-modules.nix>) ./configuration.nix {} pkgs;
|
||||
(import <liminix/merge-modules.nix>) [./configuration.nix] pkgs;
|
||||
res1 = assertMsg
|
||||
# check we have packages from both modules
|
||||
(config.config.systemPackages == ( with pkgs; [ units hello ])) "failed";
|
||||
res2 = let s = config.config.services;
|
||||
(config.systemPackages == ( with pkgs; [ units hello ])) "failed";
|
||||
res2 = let s = config.services;
|
||||
in assertMsg (s.a.enable && s.b.enable && (s.z != null) ) "failed";
|
||||
in pkgs.writeText "foo" ''
|
||||
${if res1 then "OK" else "not OK"}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs } :
|
||||
{ config, pkgs, ... } :
|
||||
let
|
||||
inherit (pkgs.liminix.networking) interface address udhcpc odhcpc;
|
||||
inherit (pkgs.liminix.services) oneshot longrun bundle target output;
|
||||
|
|
Loading…
Reference in New Issue