diff --git a/flake.lock b/flake.lock
index 51bfd9b2..72f1bff0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -447,11 +447,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720031269,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "lastModified": 1720418205,
+        "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "655a58a72a6601292512670343087c2d75d859c1",
         "type": "github"
       },
       "original": {
@@ -510,11 +510,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720457284,
-        "narHash": "sha256-qBBRcqT0IfrKRz1+kPkHtptazrdyNx68AlJQwGhp2rY=",
+        "lastModified": 1720465822,
+        "narHash": "sha256-1np515zxubYoxmxPTzbX080UMLQU616bfRTbJDjjP0Q=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e833883bd0f137e536ef87c04b7b36dd2d1c9fe7",
+        "rev": "3eb7a42f3a643a47601949ba2c1e9e08ea09efce",
         "type": "github"
       },
       "original": {
diff --git a/patches/324586.patch b/patches/324586.patch
deleted file mode 100644
index 5d5e1512..00000000
--- a/patches/324586.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
-index 749ed890e6ef053..dc002c161735834 100644
---- a/pkgs/servers/mastodon/gemset.nix
-+++ b/pkgs/servers/mastodon/gemset.nix
-@@ -5,10 +5,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw";
-+      sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   actionmailbox = {
-     dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
-@@ -16,10 +16,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9";
-+      sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   actionmailer = {
-     dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
-@@ -27,10 +27,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc";
-+      sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   actionpack = {
-     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
-@@ -38,10 +38,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax";
-+      sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   actiontext = {
-     dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
-@@ -49,10 +49,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22";
-+      sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   actionview = {
-     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
-@@ -60,10 +60,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa";
-+      sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   active_model_serializers = {
-     dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
-@@ -82,10 +82,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg";
-+      sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   activemodel = {
-     dependencies = ["activesupport"];
-@@ -93,10 +93,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1";
-+      sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   activerecord = {
-     dependencies = ["activemodel" "activesupport"];
-@@ -104,10 +104,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf";
-+      sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   activestorage = {
-     dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
-@@ -115,10 +115,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz";
-+      sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   activesupport = {
-     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
-@@ -126,10 +126,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh";
-+      sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   addressable = {
-     dependencies = ["public_suffix"];
-@@ -539,20 +539,20 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3";
-+      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
-       type = "gem";
-     };
--    version = "0.5.9.6";
-+    version = "0.5.9.8";
-   };
-   charlock_holmes = {
-     groups = ["default"];
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
-+      sha256 = "0cym7a0mrgf8wr27x07ka7fsjz3l7l9qiiyqra34f5k5ghira0c0";
-       type = "gem";
-     };
--    version = "0.7.7";
-+    version = "0.7.8";
-   };
-   chewy = {
-     dependencies = ["activesupport" "elasticsearch" "elasticsearch-dsl"];
-@@ -1344,10 +1344,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
-+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
-       type = "gem";
-     };
--    version = "1.14.1";
-+    version = "1.14.5";
-   };
-   i18n-tasks = {
-     dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"];
-@@ -1630,10 +1630,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0";
-+      sha256 = "190n2mk8m1l708kr88fh6mip9sdsh339d2s6sgrik3sbnvz4jmhd";
-       type = "gem";
-     };
--    version = "1.0.2";
-+    version = "1.0.4";
-   };
-   mario-redis-lock = {
-     dependencies = ["redis"];
-@@ -1723,10 +1723,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
-+      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
-       type = "gem";
-     };
--    version = "2.8.5";
-+    version = "2.8.7";
-   };
-   minitest = {
-     groups = ["default" "development" "pam_authentication" "production" "test"];
-@@ -1870,10 +1870,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm";
-+      sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
-       type = "gem";
-     };
--    version = "2.7.0";
-+    version = "2.7.3";
-   };
-   nokogiri = {
-     dependencies = ["mini_portile2" "racc"];
-@@ -1881,10 +1881,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1lla2macphrlbzkirk0nwwwhcijrfymyfjjw1als0kwqd0n1cdpc";
-+      sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
-       type = "gem";
-     };
--    version = "1.16.5";
-+    version = "1.16.6";
-   };
-   nsa = {
-     dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];
-@@ -2079,16 +2079,6 @@
-     };
-     version = "3.3.4";
-   };
--  posix-spawn = {
--    groups = ["default"];
--    platforms = [];
--    source = {
--      remotes = ["https://rubygems.org"];
--      sha256 = "0cmb0svalqcxfzlzc5fvrci12b79x7bakasr8gkl3q5rz6di1q52";
--      type = "gem";
--    };
--    version = "0.3.15";
--  };
-   premailer = {
-     dependencies = ["addressable" "css_parser" "htmlentities"];
-     groups = ["default"];
-@@ -2178,10 +2168,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7";
-+      sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx";
-       type = "gem";
-     };
--    version = "2.2.8.1";
-+    version = "2.2.9";
-   };
-   rack-attack = {
-     dependencies = ["rack"];
-@@ -2255,10 +2245,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx";
-+      sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   rails-controller-testing = {
-     dependencies = ["actionpack" "actionview" "activesupport"];
-@@ -2323,10 +2313,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62";
-+      sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0";
-       type = "gem";
-     };
--    version = "7.0.8.1";
-+    version = "7.0.8.4";
-   };
-   rainbow = {
-     groups = ["default" "development"];
-@@ -3034,10 +3024,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
-+      sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
-       type = "gem";
-     };
--    version = "1.3.0";
-+    version = "1.3.1";
-   };
-   tilt = {
-     groups = ["default" "development"];
-@@ -3353,10 +3343,10 @@
-     platforms = [];
-     source = {
-       remotes = ["https://rubygems.org"];
--      sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d";
-+      sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
-       type = "gem";
-     };
--    version = "2.6.13";
-+    version = "2.6.16";
-   };
- }
- 
-diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
-index 2c4eaafbbbf661f..b2dc7df4ef81c20 100644
---- a/pkgs/servers/mastodon/source.nix
-+++ b/pkgs/servers/mastodon/source.nix
-@@ -1,7 +1,7 @@
- # This file was generated by pkgs.mastodon.updateScript.
- { fetchFromGitHub, applyPatches, patches ? [] }:
- let
--  version = "4.2.9";
-+  version = "4.2.10";
- in
- (
-   applyPatches {
-@@ -9,7 +9,7 @@ in
-       owner = "mastodon";
-       repo = "mastodon";
-       rev = "v${version}";
--      hash = "sha256-VjR4lXlb1p8mmpOGxPqbmCCEaB7SP90ccPSMfGFx6IQ=";
-+      hash = "sha256-z3veI0CpZk6mBgygqXk8SN/5WWjy5VkKLxC7nOLnyZE=";
-     };
-     patches = patches ++ [];
-   }) // {