From 0025b68eca9a05d638f7bd90426c3104c79952e6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 19:49:35 +0000 Subject: [PATCH] fix: finally got items that have git-lfs working Long story short it seems that ``git+`` does not handle lfs objects when hashing it The reason we are using teh archives is as follows: https://nixos-and-flakes.thiscute.world/other-usage-of-flakes/inputs > # Regular git input doesn't support LFS yet. > # git-example-lfs.url = "https://codeberg.org/solver-orgz/treedome/archive/master.tar.gz"; --- flake.lock | 58 ++++++++++++++++++++++-------------------------------- flake.nix | 8 ++++---- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 4eccf2f..00e2d0f 100644 --- a/flake.lock +++ b/flake.lock @@ -984,17 +984,15 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724210543, - "narHash": "sha256-JLt77gajtOPwM20m86Kh2JkWuOq1+kmHr+98UMzbjAY=", - "ref": "refs/heads/main", - "rev": "0af67c9ece40fb683238093d857d96aae2414522", - "revCount": 27, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "lastModified": 1727122068, + "narHash": "sha256-KeZxFw51lKC0MQpai1HbcWSGmxEbG1Si6gBlyOzP9nQ=", + "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/d6b13f9c6e0a09346e0e210aa1733a7258e13763.tar.gz?rev=d6b13f9c6e0a09346e0e210aa1733a7258e13763" }, "original": { - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz" } }, "skynet_website_2009": { @@ -1003,17 +1001,15 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1724198445, - "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", - "ref": "refs/heads/main", - "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", - "revCount": 14, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "lastModified": 1727122067, + "narHash": "sha256-s+K1bZsYxeBrsus4vjNeGxljUj/Wtb0qYQ+5xNbZexQ=", + "rev": "a9f125fb750f33747d28271bef3b3425563096a0", + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2009/archive/a9f125fb750f33747d28271bef3b3425563096a0.tar.gz?rev=a9f125fb750f33747d28271bef3b3425563096a0" }, "original": { - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz" } }, "skynet_website_2017": { @@ -1023,17 +1019,14 @@ }, "locked": { "lastModified": 1689960297, - "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", - "ref": "refs/heads/main", + "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "revCount": 6, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99" }, "original": { - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz" } }, "skynet_website_2023": { @@ -1043,17 +1036,14 @@ }, "locked": { "lastModified": 1696876711, - "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", - "ref": "refs/heads/main", + "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "revCount": 12, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191" }, "original": { - "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index e600e63..5184299 100644 --- a/flake.nix +++ b/flake.nix @@ -47,15 +47,15 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz"; # these are past versions of teh website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2023.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2017.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; + skynet_website_2009.url = "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz"; }; nixConfig = {