From 02d744c76a213d4274c1db18262e2cc86e3de9ba Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 8 Dec 2020 20:44:40 +0100
Subject: [PATCH] dhall-genode: update to nomalize <provides> with policies

---
 nixos-modules/store-wrapper.dhall  | 12 ++++++++----
 nixos-modules/systemd-runner.dhall |  2 --
 packages/dhall/genode.nix          |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos-modules/store-wrapper.dhall b/nixos-modules/store-wrapper.dhall
index dbc0db0..1646d6b 100644
--- a/nixos-modules/store-wrapper.dhall
+++ b/nixos-modules/store-wrapper.dhall
@@ -34,7 +34,6 @@ in  λ ( params
                       ( Child.flat
                           Child.Attributes::{
                           , binary = "timer_drv"
-                          , provides = [ "Timer" ]
                           , config = Init.Config::{
                             , policies =
                               [ Init.Config.Policy::{
@@ -50,8 +49,15 @@ in  λ ( params
                       ( Child.flat
                           Child.Attributes::{
                           , binary = "rtc_drv"
-                          , provides = [ "Rtc" ]
                           , routes = [ Init.ServiceRoute.parent "IO_PORT" ]
+                          , config = Init.Config::{
+                            , policies =
+                              [ Init.Config.Policy::{
+                                , service = "Rtc"
+                                , label = Init.LabelSelector.none
+                                }
+                              ]
+                            }
                           }
                       )
                   , child
@@ -59,7 +65,6 @@ in  λ ( params
                       ( Child.flat
                           Child.Attributes::{
                           , binary = "jitter_sponge"
-                          , provides = [ "Terminal" ]
                           , config = Init.Config::{
                             , policies =
                               [ Init.Config.Policy::{
@@ -75,7 +80,6 @@ in  λ ( params
                       ( Child.flat
                           Child.Attributes::{
                           , binary = "cached_fs_rom"
-                          , provides = [ "ROM" ]
                           , resources = Init.Resources::{
                             , ram = params.storeSize + Genode.units.MiB 1
                             }
diff --git a/nixos-modules/systemd-runner.dhall b/nixos-modules/systemd-runner.dhall
index ae5eff0..ff6626e 100644
--- a/nixos-modules/systemd-runner.dhall
+++ b/nixos-modules/systemd-runner.dhall
@@ -46,7 +46,6 @@ in  λ ( params
                       Child.Attributes::{
                       , binary = "vfs"
                       , exitPropagate = True
-                      , provides = [ "File_system" ]
                       , resources = Genode.Init.Resources::{
                         , caps = 256
                         , ram = Genode.units.MiB 8
@@ -113,7 +112,6 @@ in  λ ( params
                     Child.flat
                       Child.Attributes::{
                       , binary = "cached_fs_rom"
-                      , provides = [ "ROM" ]
                       , resources = Genode.Init.Resources::{
                         , ram = Genode.units.MiB 32
                         }
diff --git a/packages/dhall/genode.nix b/packages/dhall/genode.nix
index 81185be..339d25b 100644
--- a/packages/dhall/genode.nix
+++ b/packages/dhall/genode.nix
@@ -4,8 +4,8 @@ dhallPackages.buildDhallDirectoryPackage {
   name = "dhall-genode";
   src = fetchgit {
     url = "https://git.sr.ht/~ehmry/dhall-genode";
-    rev = "01b99d53f597cac40c6b4761d6dd750fc89f63da";
-    sha256 = "1df4plhr72rhva9rdphlyq244j0rmldkpa7bj6mjzwarisdxw9vv";
+    rev = "0ad5fee8090267e674cff4418adf462d6445e786";
+    sha256 = "1626wnj24zjs4j48wyb5qsk33dvk0zxa6ac8q3i1q3zla9rhr63j";
   };
   dependencies = [ dhallPackages.Prelude ];
 }