Refactor routing
Patch init to simplify routing. Update Dhall library and NixOS modules accordingly.
This commit is contained in:
parent
af8305d309
commit
e7a00701c9
|
@ -4,15 +4,6 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.genode.init;
|
cfg = config.genode.init;
|
||||||
coreROMs = mkOption {
|
|
||||||
type = with types; listOf str;
|
|
||||||
default = [ ];
|
|
||||||
description = ''
|
|
||||||
List of label suffixes that when matched against
|
|
||||||
ROM requests shall be forwared to the core.
|
|
||||||
'';
|
|
||||||
example = [ "platform_info" ];
|
|
||||||
};
|
|
||||||
inputs = mkOption {
|
inputs = mkOption {
|
||||||
description = "List of packages to build a ROM store with.";
|
description = "List of packages to build a ROM store with.";
|
||||||
default = [ ];
|
default = [ ];
|
||||||
|
@ -56,7 +47,7 @@ in {
|
||||||
type = with types;
|
type = with types;
|
||||||
attrsOf (submodule {
|
attrsOf (submodule {
|
||||||
options = {
|
options = {
|
||||||
inherit coreROMs inputs;
|
inherit inputs;
|
||||||
configFile = mkOption {
|
configFile = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
description = ''
|
description = ''
|
||||||
|
@ -64,6 +55,15 @@ in {
|
||||||
See https://git.sr.ht/~ehmry/dhall-genode/tree/master/Init/Child/Type
|
See https://git.sr.ht/~ehmry/dhall-genode/tree/master/Init/Child/Type
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
coreROMs = mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = [ ];
|
||||||
|
description = ''
|
||||||
|
List of label suffixes that when matched against
|
||||||
|
ROM requests shall be forwared to the core.
|
||||||
|
'';
|
||||||
|
example = [ "platform_info" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -76,7 +76,7 @@ in {
|
||||||
type = with types;
|
type = with types;
|
||||||
attrsOf (submodule {
|
attrsOf (submodule {
|
||||||
options = {
|
options = {
|
||||||
inherit coreROMs inputs;
|
inherit inputs;
|
||||||
configFile = mkOption {
|
configFile = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
description = ''
|
description = ''
|
||||||
|
|
Loading…
Reference in New Issue
Block a user