From 249addc5be691feb08728a1e8ef4ec5b4fe41172 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 23 Nov 2024 15:10:45 +0000 Subject: [PATCH] fix: seems we really have to use this format for lfs enabled repos --- flake.lock | 48 ++++++++++++++++++++++++++++-------------------- flake.nix | 8 ++++---- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 478b8b0..833a472 100644 --- a/flake.lock +++ b/flake.lock @@ -985,14 +985,16 @@ }, "locked": { "lastModified": 1727122068, - "narHash": "sha256-KeZxFw51lKC0MQpai1HbcWSGmxEbG1Si6gBlyOzP9nQ=", + "narHash": "sha256-C+PD6NveB9tascXQ84rekqlDkSNwe1mFhzZXqVlNvuQ=", + "ref": "refs/heads/main", "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/d6b13f9c6e0a09346e0e210aa1733a7258e13763.tar.gz?rev=d6b13f9c6e0a09346e0e210aa1733a7258e13763" + "revCount": 28, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2009": { @@ -1002,14 +1004,16 @@ }, "locked": { "lastModified": 1727122067, - "narHash": "sha256-s+K1bZsYxeBrsus4vjNeGxljUj/Wtb0qYQ+5xNbZexQ=", + "narHash": "sha256-AAj5tmfT8IuAvgcMjlIjf5CD1LNC/gDCvFRt1NAedPw=", + "ref": "refs/heads/main", "rev": "a9f125fb750f33747d28271bef3b3425563096a0", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2009/archive/a9f125fb750f33747d28271bef3b3425563096a0.tar.gz?rev=a9f125fb750f33747d28271bef3b3425563096a0" + "revCount": 15, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" } }, "skynet_website_2017": { @@ -1019,14 +1023,16 @@ }, "locked": { "lastModified": 1689960297, - "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", + "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99" + "revCount": 6, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz" + "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2023": { @@ -1036,14 +1042,16 @@ }, "locked": { "lastModified": 1696876711, - "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", + "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191" + "revCount": 12, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz" + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index 5184299..e600e63 100644 --- a/flake.nix +++ b/flake.nix @@ -47,15 +47,15 @@ ################# # this should always point to teh current website - skynet_website.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; # these are past versions of teh website - skynet_website_2023.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz"; + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz"; + skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; }; nixConfig = {