fix dhall build

Signed-off-by: Xe Iaso <me@christine.website>

4 files changed, 100 insertions, 85 deletions

diff --git a/config.dhall b/config.dhall
index 4f82abb..5112d16 100644
--- a/config.dhall
+++ b/config.dhall
@@ -1,78 +1 @@
-let xesite = ./dhall/types/package.dhall
-
-let Config = xesite.Config
-
-let Link = xesite.Link
-
-let authors = ./dhall/authors.dhall
-
-let desc = ./dhall/seriesDescriptions.dhall
-
-in  Config::{
-    , signalboost = ./dhall/signalboost.dhall
-    , authors = authors.map
-    , defaultAuthor = authors.default
-    , clackSet =
-      [ "Ashlynn", "Terry Davis", "Dennis Ritchie", "Steven Hawking" ]
-    , jobHistory = ./dhall/jobHistory.dhall
-    , seriesDescriptions = desc.descriptions
-    , seriesDescMap = desc.map
-    , notableProjects =
-      [ Link::{
-        , url = "https://github.com/PonyvilleFM/aura"
-        , title = "Aura"
-        , description = "PonyvilleFM live DJ recording bot"
-        }
-      , Link::{
-        , url = "https://github.com/Xe/olin"
-        , title = "Olin"
-        , description = "WebAssembly on the server"
-        }
-      , Link::{
-        , url = "https://printerfacts.cetacean.club/"
-        , title = "Printer Facts"
-        , description = "Useful facts about printers"
-        }
-      , Link::{
-        , url = "https://github.com/Xe/waifud"
-        , title = "waifud"
-        , description = "A VM manager for my homelab cluster"
-        }
-      , Link::{
-        , url = "https://when-then-zen.christine.website/"
-        , title = "When Then Zen"
-        , description = "Meditation instructions in plain English"
-        }
-      , Link::{
-        , url = "https://github.com/Xe/x"
-        , title = "x"
-        , description =
-            "A monorepo of my experiments, toy programs and other interesting things of that nature."
-        }
-      , Link::{
-        , url = "https://github.com/Xe/Xeact"
-        , title = "Xeact"
-        , description =
-            "My personal JavaScript femtoframework for high productivity development"
-        }
-      , Link::{
-        , url = "https://github.com/Xe/site"
-        , title = "Xesite"
-        , description = "The backend and templates for this website"
-        }
-      , Link::{
-        , url = "https://github.com/Xe/Xess"
-        , title = "Xess"
-        , description = "My personal CSS framework"
-        }
-      ]
-    , contactLinks =
-      [ Link::{ url = "https://github.com/Xe", title = "GitHub" }
-      , Link::{ url = "https://keybase.io/xena", title = "Keybase" }
-      , Link::{ url = "https://www.patreon.com/cadey", title = "Patreon" }
-      , Link::{ url = "https://twitch.tv/princessxen", title = "Twitch" }
-      , Link::{ url = "https://pony.social/@cadey", title = "Fediverse" }
-      , Link::{ url = "https://t.me/miamorecadenza", title = "Telegram" }
-      , Link::{ url = "irc://irc.libera.chat/#xeserv", title = "IRC" }
-      ]
-    }
+./dhall/package.dhall
diff --git a/dhall/Prelude.dhall b/dhall/Prelude.dhall
index 8dbfa44..f1f4324 100644
--- a/dhall/Prelude.dhall
+++ b/dhall/Prelude.dhall
@@ -1,3 +1,3 @@
-  ./Prelude/package.dhall
+  env:DHALL_PRELUDE
 ? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v20.1.0/Prelude/package.dhall
     sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98
diff --git a/dhall/package.dhall b/dhall/package.dhall
new file mode 100644
index 0000000..fdbcc67
--- /dev/null
+++ b/dhall/package.dhall
@@ -0,0 +1,78 @@
+let xesite = ./types/package.dhall
+
+let Config = xesite.Config
+
+let Link = xesite.Link
+
+let authors = ./authors.dhall
+
+let desc = ./seriesDescriptions.dhall
+
+in  Config::{
+    , signalboost = ./signalboost.dhall
+    , authors = authors.map
+    , defaultAuthor = authors.default
+    , clackSet =
+      [ "Ashlynn", "Terry Davis", "Dennis Ritchie", "Steven Hawking" ]
+    , jobHistory = ./jobHistory.dhall
+    , seriesDescriptions = desc.descriptions
+    , seriesDescMap = desc.map
+    , notableProjects =
+      [ Link::{
+        , url = "https://github.com/PonyvilleFM/aura"
+        , title = "Aura"
+        , description = "PonyvilleFM live DJ recording bot"
+        }
+      , Link::{
+        , url = "https://github.com/Xe/olin"
+        , title = "Olin"
+        , description = "WebAssembly on the server"
+        }
+      , Link::{
+        , url = "https://printerfacts.cetacean.club/"
+        , title = "Printer Facts"
+        , description = "Useful facts about printers"
+        }
+      , Link::{
+        , url = "https://github.com/Xe/waifud"
+        , title = "waifud"
+        , description = "A VM manager for my homelab cluster"
+        }
+      , Link::{
+        , url = "https://when-then-zen.christine.website/"
+        , title = "When Then Zen"
+        , description = "Meditation instructions in plain English"
+        }
+      , Link::{
+        , url = "https://github.com/Xe/x"
+        , title = "x"
+        , description =
+            "A monorepo of my experiments, toy programs and other interesting things of that nature."
+        }
+      , Link::{
+        , url = "https://github.com/Xe/Xeact"
+        , title = "Xeact"
+        , description =
+            "My personal JavaScript femtoframework for high productivity development"
+        }
+      , Link::{
+        , url = "https://github.com/Xe/site"
+        , title = "Xesite"
+        , description = "The backend and templates for this website"
+        }
+      , Link::{
+        , url = "https://github.com/Xe/Xess"
+        , title = "Xess"
+        , description = "My personal CSS framework"
+        }
+      ]
+    , contactLinks =
+      [ Link::{ url = "https://github.com/Xe", title = "GitHub" }
+      , Link::{ url = "https://keybase.io/xena", title = "Keybase" }
+      , Link::{ url = "https://www.patreon.com/cadey", title = "Patreon" }
+      , Link::{ url = "https://twitch.tv/princessxen", title = "Twitch" }
+      , Link::{ url = "https://pony.social/@cadey", title = "Fediverse" }
+      , Link::{ url = "https://t.me/miamorecadenza", title = "Telegram" }
+      , Link::{ url = "irc://irc.libera.chat/#xeserv", title = "IRC" }
+      ]
+    }
diff --git a/flake.nix b/flake.nix
index 766fa94..83c10df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,13 @@
           bin = naersk-lib.buildPackage {
             pname = "xesite-bin";
             root = src;
-            buildInputs = with pkgs; [ pkg-config openssl git ];
+            buildInputs = with pkgs; [
+              pkg-config
+              openssl
+              git
+              deno
+              nodePackages.uglify-js
+            ];
           };
 
           config = pkgs.stdenv.mkDerivation {
@@ -37,10 +43,14 @@
             phases = "installPhase";
 
             installPhase = ''
-              cd $src
+              set -x
               mkdir -p $out
-              export DHALL_PRELUDE=${pkgs.dhallPackages.Prelude}/binary.dhall
-              dhall resolve < $src/config.dhall >> $out/config.dhall
+              cp -rf ${pkgs.dhallPackages.Prelude}/.cache .cache
+              chmod -R u+w .cache
+              export XDG_CACHE_HOME=.cache
+              export DHALL_PRELUDE=${pkgs.dhallPackages.Prelude}/binary.dhall;
+              dhall resolve --file $src/config.dhall >> $out/config.dhall
+              set +x
             '';
           };
 
@@ -104,11 +114,15 @@
             openssl
             pkg-config
 
-            # kubernetes deployment
+            # dhall
             dhall
             dhall-json
             dhall-lsp-server
 
+            # frontend
+            deno
+            nodePackages.uglify-js
+
             # dependency manager
             niv
 
@@ -122,7 +136,7 @@
           RUST_LOG = "debug";
           RUST_BACKTRACE = "1";
           GITHUB_SHA = "devel";
-          DHALL_PRELUDE = "${pkgs.dhallPackages.Prelude}/binary.dhall";
+          DHALL_PRELUDE = "${pkgs.dhallPackages.Prelude}";
         };
 
         nixosModules.bot = { config, lib, ... }: