From a57565678ad69c7463139313ca026caac0a191c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Mon, 20 Jul 2020 20:57:00 +0100
Subject: [PATCH 1/2] Update the rust webserver

---
 etc/nixos/derivations/tlaternet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/nixos/derivations/tlaternet b/etc/nixos/derivations/tlaternet
index bb19002..114a878 160000
--- a/etc/nixos/derivations/tlaternet
+++ b/etc/nixos/derivations/tlaternet
@@ -1 +1 @@
-Subproject commit bb19002f511e7ffe54fc2375562e32ed9526c740
+Subproject commit 114a87885e1b3852c4cf6fe9854c86045770b3e4
-- 
2.44.1


From dd1335cb369147231a3db78bd91a7761d97266d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Mon, 20 Jul 2020 21:03:01 +0100
Subject: [PATCH 2/2] Update the templates

---
 etc/nixos/derivations/dist.tar.gz             |  3 +++
 etc/nixos/derivations/tlaternet-templates     |  1 -
 etc/nixos/derivations/tlaternet-templates.nix | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 etc/nixos/derivations/dist.tar.gz
 delete mode 160000 etc/nixos/derivations/tlaternet-templates
 create mode 100644 etc/nixos/derivations/tlaternet-templates.nix

diff --git a/etc/nixos/derivations/dist.tar.gz b/etc/nixos/derivations/dist.tar.gz
new file mode 100644
index 0000000..3af5e0f
--- /dev/null
+++ b/etc/nixos/derivations/dist.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1abd2b09bb63554cd6d49d774774cbfb4a933827ceeba373f04bdfbf992a7e5f
+size 11858678
diff --git a/etc/nixos/derivations/tlaternet-templates b/etc/nixos/derivations/tlaternet-templates
deleted file mode 160000
index 1160d96..0000000
--- a/etc/nixos/derivations/tlaternet-templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1160d96b064531f65290e2d665c7c8d05fc3d29a
diff --git a/etc/nixos/derivations/tlaternet-templates.nix b/etc/nixos/derivations/tlaternet-templates.nix
new file mode 100644
index 0000000..dbcf050
--- /dev/null
+++ b/etc/nixos/derivations/tlaternet-templates.nix
@@ -0,0 +1,15 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+with pkgs;
+
+# TODO: Once https://github.com/svanderburg/node2nix/issues/184 is
+# fixed, use a proper nixos package instead of a tarball.
+stdenv.mkDerivation {
+  pname = "tlaternet-templates";
+  version = "1.0";
+  src = ./dist.tar.gz;
+  installPhase = ''
+    mkdir -p $out/srv/
+    mv browser $out/srv/web
+  '';
+}
-- 
2.44.1