From baa139c9b68475363c7d5541c151344bbc23a96b Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Sun, 25 Feb 2024 22:07:41 +0100
Subject: [PATCH] chore(npins): Update

Also update forgejo to the latest version
---
 npins/sources.json  | 18 +++++++++---------
 patches/default.nix | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index 8296cab..3e1f4cd 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -115,20 +115,20 @@
     "nixos-23.11": {
       "type": "Channel",
       "name": "nixos-23.11",
-      "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.4575.526d051b128b/nixexprs.tar.xz",
-      "hash": "1rh8mbicz6pwafhhk9azwvfwh3kk2hh90rmw1j81rinavl1sk4c9"
+      "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.4761.5bf1cadb72ab/nixexprs.tar.xz",
+      "hash": "0s7vpavflvzf4gniy1s3mrmwfrcz39zlb4xnb5015bc64msh22g7"
     },
     "nixos-unstable": {
       "type": "Channel",
       "name": "nixos-unstable",
-      "url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre586498.0e74ca98a74b/nixexprs.tar.xz",
-      "hash": "0yzqrzjfx9i7k1mnwbq25jhs11y5r55h25ykzbwfh5rj4jdc15i4"
+      "url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre588267.73de017ef2d1/nixexprs.tar.xz",
+      "hash": "1hcnwcankhqh0pk7g0njszm3553a6845dzy1yzq3jy5msrr4l2qy"
     },
     "nixpkgs": {
       "type": "Channel",
       "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre586734.98b00b6947a9/nixexprs.tar.xz",
-      "hash": "17n0arljd3zp0dbldsg0v0gv1zkbqhx0gvx28fq9jc304jm5idvr"
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre588366.9a9dae8f6319/nixexprs.tar.xz",
+      "hash": "11zjywladdaw8jb86rqrccqzf4w13ffp86w2q6lgrm3xibx363jb"
     },
     "pre-commit-hooks": {
       "type": "Git",
@@ -161,9 +161,9 @@
         "server": "https://git.helsinki.tools/"
       },
       "branch": "master",
-      "revision": "e4e15eab76c66b5d1661fe825bb532ae4a62e5f6",
-      "url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=e4e15eab76c66b5d1661fe825bb532ae4a62e5f6",
-      "hash": "040pvl36pk3smlfh68hb8dy07i7jgq6d8r79142h27965in9gq07"
+      "revision": "1b537ad1fadd30173b0b728d4e1003eb5d19e468",
+      "url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=1b537ad1fadd30173b0b728d4e1003eb5d19e468",
+      "hash": "148z9n9n6g3qk2v5iik24a1nr82hfq4kwg6akip5q5rpq4lmx0bh"
     }
   },
   "version": 3
diff --git a/patches/default.nix b/patches/default.nix
index a534d8d..1a91871 100644
--- a/patches/default.nix
+++ b/patches/default.nix
@@ -13,6 +13,13 @@
       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;
@@ -51,6 +58,24 @@
       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;