diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index ac303b6..9b6a664 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -76,7 +76,7 @@ let "intel_fb_drv" "vfs" "vfs_ttf" - ] ++ [ pkgs'.base-nova pkgs'.block_router ]; + ] ++ (with pkgs'; [ base-nova block_router ]); extraBinaries = [ "ld.lib.so" "libc.so" diff --git a/nixos-modules/dhall/vbox-host.dhall b/nixos-modules/dhall/vbox-host.dhall index 02001cb..ee01783 100644 --- a/nixos-modules/dhall/vbox-host.dhall +++ b/nixos-modules/dhall/vbox-host.dhall @@ -25,6 +25,7 @@ let rootInit = λ(guests : Init.Children.Type) → Init::{ , routes = [ ServiceRoute.child "Timer" "timer" ] + , verbose = True , children = toMap { timer = Child.flat @@ -280,10 +281,6 @@ let rootInit = Child.flat Child.Attributes::{ , binary = "nit_fb" - , config = Init.Config::{ - , attributes = toMap - { xpos = "200", width = "600", height = "600" } - } , provides = [ "Framebuffer", "Input" ] , resources = Resources::{ ram = Genode.units.MiB 8 } , routes = @@ -315,7 +312,7 @@ let rootInit = - + @@ -523,6 +520,21 @@ let rootInit = (Some "store_rom") ] } + , chroot = + Child.flat + Child.Attributes::{ + , binary = "chroot" + , config = Init.Config::{ + , content = + [ XML.leaf + { name = "default-policy" + , attributes = toMap { writeable = "yes" } + } + ] + } + , provides = [ "File_system" ] + , routes = [ ServiceRoute.child "File_system" "file_system" ] + } , nic_drv = Child.flat Child.Attributes::{ @@ -540,21 +552,6 @@ let rootInit = (Some "nic_drv") ] } - , chroot = - Child.flat - Child.Attributes::{ - , binary = "chroot" - , config = Init.Config::{ - , content = - [ XML.leaf - { name = "default-policy" - , attributes = toMap { writeable = "yes" } - } - ] - } - , provides = [ "File_system" ] - , routes = [ ServiceRoute.child "File_system" "file_system" ] - } , guests = Init.toChild Init::{ children = guests, verbose = True }