fixup adding device manager to nixos-modules/default.nix

Do enable the device_manager without ahci or usb
This commit is contained in:
Ehmry - 2021-04-10 09:07:51 +02:00
parent cd1b95c1d7
commit 4edc22e0fd
2 changed files with 46 additions and 16 deletions

View File

@ -121,23 +121,25 @@ with lib;
'';
};
genode.core.children.device_manager = {
package = pkgs.genodePackages.device_manager;
configFile = pkgs.writeText "device_manager.dhall" ''
let Sigil = env:DHALL_SIGIL
genode.core.children.device_manager = lib.mkIf
(config.hardware.genode.ahci.enable
|| config.hardware.genode.usb.enable) {
package = pkgs.genodePackages.device_manager;
configFile = pkgs.writeText "device_manager.dhall" ''
let Sigil = env:DHALL_SIGIL
in λ(cap : Text)
Sigil.Init.Child.flat
( (${managerConfig}).device_manager
{ binary = cap
, resources = Sigil.Init.Resources::{
, caps = 256
, ram = Sigil.units.MiB 8
}
}
)
'';
};
in λ(cap : Text)
Sigil.Init.Child.flat
( (${managerConfig}).device_manager
{ binary = cap
, resources = Sigil.Init.Resources::{
, caps = 256
, ram = Sigil.units.MiB 8
}
}
)
'';
};
genode.core.children.drivers = {
package = pkgs.genodePackages.init;

28
tests/tor.nix Normal file
View File

@ -0,0 +1,28 @@
{
name = "tor";
machine = { config, lib, pkgs, ... }: {
# imports = [ ../nixos-modules/systemd.nix ];
# genode.core.storeBackend = "fs";
# hardware.genode.usb.enable = true;
# hardware.genode.usb.storage.enable = true;
services.tor = {
enable = true;
client.enable = false;
extraConfig = ''
Log [general,net,config,fs]debug stdout
'';
relay = {
enable = true;
port = 80;
role = "relay";
bridgeTransports = [ ];
};
};
systemd.services.tor.genode = {
enable = true;
ramQuota = 300;
};
};
}