From 75409ed0df2a3944c2cf94556951eb0e591bd579 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Sat, 13 Apr 2024 13:44:06 +0200
Subject: [PATCH] feat(forgejo): Use package from nixos-unstable

---
 machines/storage01/forgejo.nix |  4 +-
 patches/default.nix            | 75 +++-------------------------------
 2 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/machines/storage01/forgejo.nix b/machines/storage01/forgejo.nix
index 9092f65..59d846e 100644
--- a/machines/storage01/forgejo.nix
+++ b/machines/storage01/forgejo.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, nixpkgs, ... }:
 
 let
   port = 3000;
@@ -10,7 +10,7 @@ in
       enable = true;
 
       user = "git";
-      package = pkgs.forgejo;
+      package = nixpkgs.unstable.forgejo;
       stateDir = "/var/lib/git";
 
       database = {
diff --git a/patches/default.nix b/patches/default.nix
index 4c54268..2a9cc55 100644
--- a/patches/default.nix
+++ b/patches/default.nix
@@ -1,11 +1,10 @@
 let
-  netboxAgent =
-    # netbox-agent
-    {
-      id = "244549";
-      hash = "sha256-wWpp4br8bVxXobjuWrBY1XnxK+mOkuyU9Pr+UJ8CsvI=";
-    };
+  netboxAgent = {
+    id = "244549";
+    hash = "sha256-wWpp4br8bVxXobjuWrBY1XnxK+mOkuyU9Pr+UJ8CsvI=";
+  };
 in
+
 {
   "nixos-23.11" = [
     # netbox module
@@ -82,75 +81,13 @@ in
       path = ./castopod.patch;
     }
 
-    # forgejo: 1.20.6-1 -> 1.20.6-1-unstable-2024-02-22 [revert]
-    {
-      id = 290725;
-      revert = true;
-      hash = "sha256-Fu/HpmFL/Aon8TagCN20DHLab6fMSWX6uZ6J+i8mf4o=";
-    }
-
-    # forgejo: 1.20.6-0 -> 1.20.6-1 [revert]
-    {
-      id = 274026;
-      revert = true;
-      hash = "sha256-wMPjRvpLQzMdnz5qO2VWiAVY0LroXUjiJ2temZbLKcM=";
-    }
-
-    # forgejo: 1.20.5-1 -> 1.20.6-0 [revert]
-    {
-      id = 270697;
-      revert = true;
-      hash = "sha256-yJ5IkhlwH0hUsupOeZtTkdvWbMMQK2JKpcIPlKQjkp8=";
-    }
-
-    # forgejo: 1.20.5-1 -> 1.21.1-0
-    {
-      id = 270195;
-      hash = "sha256-c65ENvvGVKrFUzx/rlWVPTsvWY8L4zPH3/lOMwvJyiA=";
-    }
-
-    # forgejo: 1.21.1-0 -> 1.21.2-0
-    {
-      id = 273035;
-      hash = "sha256-bxuXH6KZGdu1yIgyeAHP+K7xGgJ404jSE32saGHf9KM=";
-    }
-
-    # forgejo: 1.21.2-0 -> 1.21.2-1
-    {
-      id = 273823;
-      hash = "sha256-16wDx1qp6KVcGgEIjL2pPKMAAT4hdDJ37lPUp5J7QVc=";
-    }
-
-    # forgejo: 1.21.2-1 -> 1.21.3-0
-    {
-      id = 276151;
-      hash = "sha256-gDT3DyCpZ6jh/EVAaqhEVv75ZZg3yUuDp9PR7pJxrLc=";
-    }
-
-    # forgejo: 1.21.3-0 -> 1.21.4-0
-    {
-      id = 281414;
-      hash = "sha256-OUgHdIbIn6ksfOKZU0b4XqxYfLnipc3hJsCwudSkc5I=";
-    }
-
-    # forgejo: 1.21.4-0 -> 1.21.5-0
-    {
-      id = 285383;
-      hash = "sha256-oxGQVeWGKUAfXRgoS9dYFYCrHocIFbwlN62UUdfJ+8M=";
-    }
-
-    # forgejo: 1.21.5-0 -> 1.21.6-0
-    {
-      id = 290705;
-      hash = "sha256-A3LAHBwzRHBqNeQBYNerYILXydgIK6BBDj4bVWSUDfk=";
-    }
-
     # nixos/nextcloud: Rename autocreate (a no-op) to verify_bucket_exists
     {
       id = 275165;
       hash = "sha256-XVq72jiLCDrZhADgyvI5y1y/5zlpX89vUBvxUolrYp8=";
     }
   ];
+
   "nixos-unstable" = [
     netboxAgent