From a15f26c5ef92b06de973524c63bfc0f979689808 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Sun, 9 Jul 2023 13:05:48 +0200
Subject: [PATCH] update mastodon

---
 nixos/pkgs/glitch-soc/default.nix | 1 -
 nixos/pkgs/glitch-soc/gemset.nix  | 8 ++++----
 nixos/pkgs/glitch-soc/source.nix  | 4 ++--
 nixos/pkgs/glitch-soc/version.nix | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/pkgs/glitch-soc/default.nix b/nixos/pkgs/glitch-soc/default.nix
index 1ffe0d39..9e48ff7d 100644
--- a/nixos/pkgs/glitch-soc/default.nix
+++ b/nixos/pkgs/glitch-soc/default.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
 
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = "${src}/yarn.lock";
-      # sha256 = lib.fakeSha256;
       sha256 = "sha256-8fUJ1RBQZ16R3IpA/JEcn+PO04ApQ9TkHuYKycvV8BY=";
     };
 
diff --git a/nixos/pkgs/glitch-soc/gemset.nix b/nixos/pkgs/glitch-soc/gemset.nix
index 855957d8..dc7fe6fc 100644
--- a/nixos/pkgs/glitch-soc/gemset.nix
+++ b/nixos/pkgs/glitch-soc/gemset.nix
@@ -1786,10 +1786,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10";
+      sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
       type = "gem";
     };
-    version = "1.15.2";
+    version = "1.15.3";
   };
   oj = {
     groups = ["default"];
@@ -2607,10 +2607,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3";
+      sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   scenic = {
     dependencies = ["activerecord" "railties"];
diff --git a/nixos/pkgs/glitch-soc/source.nix b/nixos/pkgs/glitch-soc/source.nix
index 3613bb19..07ddd948 100644
--- a/nixos/pkgs/glitch-soc/source.nix
+++ b/nixos/pkgs/glitch-soc/source.nix
@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/glitch-soc/mastodon.git";
-    rev = "ed15893eed1d0f0b80867c0b834a5962c0dbd3c2";
-    sha256 = "1lkcqqgk8pfrwjz5m8zq5dnwix18sc4i89cc58iqifwqzb53wqxl";
+    rev = "a40529fa79c6882eb1929014e5f9324d8e81ae49";
+    sha256 = "0xppgbbms9a856w9h3pdzv4cxf4rgcg1wrxy8pmfmbf4cvjxkgpx";
   };
 in applyPatches {
   inherit src;
diff --git a/nixos/pkgs/glitch-soc/version.nix b/nixos/pkgs/glitch-soc/version.nix
index d80cafca..6ee44f9e 100644
--- a/nixos/pkgs/glitch-soc/version.nix
+++ b/nixos/pkgs/glitch-soc/version.nix
@@ -1 +1 @@
-"4.1.2"
+"4.1.4"