From 415f7ccd165fec95eb2451ad3f23d95a0c4d2143 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 15 Sep 2023 20:08:37 +0200
Subject: Fix build

---
 Dockerfile |  7 +++++-
 flake.lock | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 flake.nix  | 19 ++++------------
 3 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 79533e9..5e48523 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,11 @@ FROM ghcr.io/getzola/zola:v${ZOLA_VERSION} as ssg
 
 WORKDIR /web
 
-COPY --link website ./
+COPY --link config.toml config.toml
+COPY --link themes themes
+COPY --link templates templates
+COPY --link static static
+COPY --link content content
 
 RUN [ "zola", "build", "--force" ]
 
@@ -43,6 +47,7 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/a
 
 RUN apk add --no-cache prettier@testing make fd brotli gzip zstd
 
+COPY --link Makefile ./
 COPY --from=ssg /web ./
 
 RUN make -j4 format compress
diff --git a/flake.lock b/flake.lock
index 0f56f8b..3db6574 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,61 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flockenzeit": {
+      "locked": {
+        "lastModified": 1671185345,
+        "narHash": "sha256-+5IWi+iJAYcRxvLN15hKO2hVwNokfN3U+lvWf/zFtCg=",
+        "owner": "balsoft",
+        "repo": "Flockenzeit",
+        "rev": "90abba65671690d95b5d28ce6dd8de7959aa1339",
+        "type": "github"
+      },
+      "original": {
+        "owner": "balsoft",
+        "repo": "Flockenzeit",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689261696,
-        "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
+        "lastModified": 1694760568,
+        "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
+        "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
         "type": "github"
       },
       "original": {
@@ -18,8 +67,26 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "flockenzeit": "flockenzeit",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 900c3cf..3ccad0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,12 +13,6 @@
       (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          overlays = [
-            (final: prev: rec {
-              nodejs = prev.nodejs-18_x;
-              bun = (prev.bun.override { inherit nodejs; });
-            })
-          ];
           nativeBuildInputs = with pkgs; [
             zola
             nodePackages.prettier
@@ -54,17 +48,12 @@
           devShells = {
             default = pkgs.mkShell {
               packages = with pkgs; [
-                node2nix
-                nodejs
-              ] ++ (with pkgs.nodePackages; [
-                prettier
-              ]);
-            };
-            ssg = pkgs.mkShell {
-              buildInputs = with pkgs; [
+                bun
                 caddy
                 flyctl
-              ] ++ nativeBuildInputs;
+              ] ++ nativeBuildInputs ++ (with pkgs.nodePackages; [
+                prettier
+              ]);
             };
           };
         });
-- 
cgit 1.4.1