From c8671b63d801793471f6f4e25c8203089f38ac37 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 14 Apr 2021 10:17:54 +0200
Subject: [PATCH] dhall-sigil: update for priority rename

---
 nixos-modules/eris/rom-fs.nix     | 30 -------------------------
 nixos-modules/eris/rom-memory.nix | 32 --------------------------
 packages/dhall/sigil.nix          |  4 ++--
 tests/backdrop.dhall              | 37 +++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 64 deletions(-)
 delete mode 100644 nixos-modules/eris/rom-fs.nix
 delete mode 100644 nixos-modules/eris/rom-memory.nix
 create mode 100644 tests/backdrop.dhall

diff --git a/nixos-modules/eris/rom-fs.nix b/nixos-modules/eris/rom-fs.nix
deleted file mode 100644
index 4f0fb2b..0000000
--- a/nixos-modules/eris/rom-fs.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  config = lib.mkIf (config.genode.core.storeBackend == "fs") {
-
-    genode.core.children.eris_vfs = let
-      vfsRump = lib.getEris' "lib" pkgs.genodePackages.rump "vfs_rump.lib.so";
-    in {
-      package = pkgs.genodePackages.vfs;
-      extraErisInputs = [ vfsRump ];
-      configFile = pkgs.writeText "rom-vfs.dhall" ''
-        let Sigil = env:DHALL_SIGIL
-
-        let VFS = Sigil.VFS
-
-        in  ${./rom-vfs.dhall}
-              "${config.block.partitions.store.guid}"
-              Sigil.Init.Resources::{ caps = 256, ram = Sigil.units.MiB 32 }
-              ( VFS.vfs
-                  [ VFS.leafAttrs
-                      "plugin"
-                      (toMap { load = "${vfsRump.cap}", fs = "cd9660", ram = "12M", writeable="no" })
-                  ]
-              )
-      '';
-    };
-
-  };
-
-}
diff --git a/nixos-modules/eris/rom-memory.nix b/nixos-modules/eris/rom-memory.nix
deleted file mode 100644
index 9bca43f..0000000
--- a/nixos-modules/eris/rom-memory.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-
-  config = lib.mkIf (config.genode.core.storeBackend == "memory") {
-
-    genode.core.children.eris_vfs = {
-      package = pkgs.genodePackages.vfs;
-      configFile = pkgs.writeText "rom-vfs.dhall" ''
-        let Sigil = env:DHALL_SIGIL
-
-        let VFS = Sigil.VFS
-
-        in  ${./rom-vfs.dhall}
-              ${../partition-type}
-              Sigil.Init.Resources::{ ram = Sigil.units.MiB 4 }
-              ( VFS.vfs
-                  [ VFS.leafAttrs
-                      "tar"
-                      ( toMap
-                          { name =
-                              "${config.system.build.tarball}/tarball/${config.system.build.tarball.fileName}.tar"
-                          }
-                      )
-                  ]
-              )
-      '';
-    };
-
-  };
-
-}
diff --git a/packages/dhall/sigil.nix b/packages/dhall/sigil.nix
index 7375515..2baff9a 100644
--- a/packages/dhall/sigil.nix
+++ b/packages/dhall/sigil.nix
@@ -4,8 +4,8 @@ dhallPackages.buildDhallDirectoryPackage {
   name = "dhall-sigil";
   src = fetchgit {
     url = "https://git.sr.ht/~ehmry/dhall-sigil";
-    rev = "e5a9bc19b23609b76512bc82173487671bd843db";
-    sha256 = "0inr4a0dn0201bcklj2x9inshqcmsn26fbh9wnyv7wac384fj47k";
+    rev = "fbdec3209f6e5aaa95abd2d1121164e31896b1df";
+    sha256 = "0h19nm0wrflnl16klnwgcj8316fnx0v7d3rqnv87pq63dar4sjk9";
   };
   dependencies = [ dhallPackages.Prelude ];
 }
diff --git a/tests/backdrop.dhall b/tests/backdrop.dhall
new file mode 100644
index 0000000..ca6b954
--- /dev/null
+++ b/tests/backdrop.dhall
@@ -0,0 +1,37 @@
+let Sigil = env:DHALL_SIGIL
+
+let Init = Sigil.Init
+
+let Child = Init.Child
+
+let Libc = Sigil.Libc
+
+in  λ(binary : Text) →
+      Child.flat
+        Child.Attributes::{
+        , binary
+        , resources = Sigil.Init.Resources::{
+          , caps = 256
+          , ram = Sigil.units.MiB 16
+          }
+        , config =
+            let cfg =
+                  Libc.toConfig
+                    Libc::{
+                    , rtc = None Text
+                    , vfs =
+                      [ VFS.dir "dev" [ VFS.leaf "null", VFS.leaf "log" ]
+                      , VFS.leafAttrs "rom" (toMap { name = "backdrop.png" })
+                      ]
+                    }
+
+            in  cfg
+              with content =
+                    cfg.content
+                  # [ XML.leaf
+                        { name = "image"
+                        , attributes = toMap
+                            { png = "backdrop.png", anchor = "bottomright" }
+                        }
+                    ]
+        }