From b943e5ec0d823f7e086cb2803c08043728df62a1 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Fri, 4 Apr 2025 00:58:37 +0100
Subject: [PATCH] fix: some errors with teh websites

also add 2024 snapshot
---
 .forgejo/workflows/update_websites.yaml |  2 ++
 applications/skynet.ie/skynet.ie.nix    |  1 +
 flake.lock                              | 16 ++++++++++------
 flake.nix                               |  5 +++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/update_websites.yaml b/.forgejo/workflows/update_websites.yaml
index e517f25..c27629e 100644
--- a/.forgejo/workflows/update_websites.yaml
+++ b/.forgejo/workflows/update_websites.yaml
@@ -32,6 +32,8 @@ jobs:
         shell: bash
       - run: nix flake update skynet_website_2023
         shell: bash
+      - run: nix flake update skynet_website_2024
+        shell: bash
       - run: nix flake update skynet_website
         shell: bash
       - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix
index a73b695..98a401a 100644
--- a/applications/skynet.ie/skynet.ie.nix
+++ b/applications/skynet.ie/skynet.ie.nix
@@ -12,6 +12,7 @@ in {
   imports = [
     # import in past website versions, available at $year.skynet.ie
     # at teh end of teh year add it here
+    (import ./old_site.nix {year = "2024";})
     (import ./old_site.nix {year = "2023";})
     (import ./old_site.nix {year = "2021";})
     (import ./old_site.nix {year = "2016";})
diff --git a/flake.lock b/flake.lock
index e0c3973..ced0274 100644
--- a/flake.lock
+++ b/flake.lock
@@ -674,11 +674,11 @@
     },
     "nixpkgs_17": {
       "locked": {
-        "lastModified": 1689935543,
-        "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
+        "lastModified": 1724114134,
+        "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
+        "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4",
         "type": "github"
       },
       "original": {
@@ -1087,12 +1087,14 @@
       "locked": {
         "lastModified": 1689960297,
         "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=",
+        "ref": "main",
         "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99",
         "revCount": 6,
         "type": "git",
         "url": "https://forgejo.skynet.ie/Skynet/website_2021"
       },
       "original": {
+        "ref": "main",
         "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99",
         "type": "git",
         "url": "https://forgejo.skynet.ie/Skynet/website_2021"
@@ -1106,12 +1108,14 @@
       "locked": {
         "lastModified": 1696876711,
         "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=",
+        "ref": "main",
         "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
         "revCount": 12,
         "type": "git",
         "url": "https://forgejo.skynet.ie/Skynet/website_2021"
       },
       "original": {
+        "ref": "main",
         "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
         "type": "git",
         "url": "https://forgejo.skynet.ie/Skynet/website_2021"
@@ -1435,11 +1439,11 @@
         "systems": "systems_13"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c28a21a..95f2a0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,8 +52,9 @@
     skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021";
 
     # past versions of the current website
-    skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191";
-    skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99";
+    skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885";
+    skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191";
+    skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99";
 
     skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016";
     skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006";