From 8e5abb9e91dcb31d2a1120f79237e7359f9eae58 Mon Sep 17 00:00:00 2001
From: Matthew Davidson <matthew@modulolotus.net>
Date: Fri, 3 May 2024 00:51:03 +0700
Subject: [PATCH] fix: Get CI uberjar build working again

Requires updating node to v20.
---
 .github/workflows/build.yaml |  5 ++---
 flake.lock                   | 30 ++++++++++++++++++++++++------
 flake.nix                    |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 67822a4..820c72d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,15 +28,14 @@ jobs:
           path: node_modules
           key: gitlibs-${{ hashFiles('package.json', 'pnpm-lock.json') }}
 
-
       - name: Prepare Nix shell
         run: nix develop -c bash -c ':'
 
       - name: Prepare JavaScript dependencies
         run: nix develop -c pnpm install --no-frozen-lockfile
 
-      - name: Prepare Clojure dependencies
+      - name: Prepare Clojure test dependencies
         run: nix develop -c clojure -A:test -P
 
-      - name: Prepare Clojure dependencies
+      - name: Build Clojure uberjar
         run: nix develop -c clojure -X:build uberjar
diff --git a/flake.lock b/flake.lock
index 0b06318..46e276f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -17,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1661353537,
-        "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
+        "lastModified": 1714656196,
+        "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
+        "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc",
         "type": "github"
       },
       "original": {
@@ -36,6 +39,21 @@
         "flake-utils": "flake-utils",
         "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 cc0dbbb..ba7f8e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
           buildInputs = with pkgs; [
             clj-kondo
             clojure
-            nodejs-18_x
+            nodejs_20
             pkgs.nodePackages.pnpm
           ];
         };