From 44cc2e1a90bd1e5c13e1738ceb47b876a2175cfb Mon Sep 17 00:00:00 2001
From: yuri <yuri@nekover.se>
Date: Mon, 4 Dec 2023 23:33:59 +0100
Subject: [PATCH] Update mastodon to 4.2.2 and add
 008_increase_profile_metadata_limit patch

---
 config/hosts/mastodon/mastodon.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix
index 29a9560..f2d7304 100644
--- a/config/hosts/mastodon/mastodon.nix
+++ b/config/hosts/mastodon/mastodon.nix
@@ -2,16 +2,16 @@
 let
   mastodonNekoversePatches = pkgs.fetchgit {
     url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git";
-    hash = "sha256-HZP9UndsOcBhFV5T70R1HlYrCL+cqViZVJxHptxZKB8=";
+    hash = "sha256-2ZTwgcApKrXnO6isJFZk2oLaFB8hm1OAlPxftxXL25g=";
   };
   mastodonNekoverseOverlay = final: prev: {
     mastodon = (prev.mastodon.override rec {
-      version = "4.2.1";
+      version = "4.2.2";
       srcOverride = final.applyPatches {
         src = final.fetchgit {
           url = "https://github.com/mastodon/mastodon.git";
           rev = "v${version}";
-          sha256 = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw=";
+          sha256 = "sha256-D3qIrxj6mHtepMAYHq6USOM+ukMF7J/y20/y+CUh5RU=";
         };
         patches = [
           "${mastodonNekoversePatches}/patches/001_increase_image_dimensions_limit.patch"
@@ -20,6 +20,7 @@ let
           "${mastodonNekoversePatches}/patches/005_improve_custom_emoji_support.patch"
           "${mastodonNekoversePatches}/patches/006_increase_display_name_character_limit.patch"
           "${mastodonNekoversePatches}/patches/007_increase_toot_character_limit.patch"
+          "${mastodonNekoversePatches}/patches/008_increase_profile_metadata_limit.patch"
         ];
       };
       yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE=";
@@ -29,16 +30,6 @@ let
   vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU=";
 in
 {
-  disabledModules = [
-    "services/databases/postgresql.nix"
-    "services/web-apps/mastodon.nix"
-  ];
-
-  imports = [
-    "${nixpkgs-unstable}/nixos/modules/services/databases/postgresql.nix"
-    "${nixpkgs-unstable}/nixos/modules/services/web-apps/mastodon.nix"
-  ];
-
   services.mastodon = {
     enable = true;
     package = pkgs-overlay.mastodon;