From eb14809c2743c3d1c76b95d50465b799d5ccc3e0 Mon Sep 17 00:00:00 2001
From: Ivan Reshetnikov <ordinarydev@protonmail.com>
Date: Thu, 29 Feb 2024 22:02:25 +0500
Subject: [PATCH] feat: update mastodon to v4.2.8

---
 flake.lock                  |  6 +++---
 nixos/programs/mastodon.nix | 37 +++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9f069e8..21bf43a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707978831,
-        "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
+        "lastModified": 1709128929,
+        "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
+        "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611",
         "type": "github"
       },
       "original": {
diff --git a/nixos/programs/mastodon.nix b/nixos/programs/mastodon.nix
index 1478d45..8e7050e 100644
--- a/nixos/programs/mastodon.nix
+++ b/nixos/programs/mastodon.nix
@@ -1,23 +1,24 @@
 { config, ... }:
 {
-  nixpkgs.overlays = [
-    (final: prev:
-       rec {
-         mastodon = prev.mastodon.override {
-           version = "4.2.7";
-           gemset = builtins.toString (final.fetchurl {
-             url = "https://raw.githubusercontent.com/NixOS/nixpkgs/61acce0cb596050f5fa1c6ebf3f339a893361028/pkgs/servers/mastodon/gemset.nix";
-             hash = "sha256-Npny6jwon/xdTMU7xOZSZmiwId5IMDUgno1dG1FGkhA=";
-           });
-           patches = [
-             (final.fetchpatch {
-               url = "https://github.com/mastodon/mastodon/compare/v4.2.6...v4.2.7.patch";
-               hash = "sha256-8FhlSIHOKIEjq62+rp8QdHY87qMCtDZwjyR0HabdHig=";
-             })
-           ];
-         };
-       })
-  ];
+  # For emergency updates:
+  # nixpkgs.overlays = [
+  #   (final: prev:
+  #      rec {
+  #        mastodon = prev.mastodon.override {
+  #          version = "4.2.7";
+  #          gemset = builtins.toString (final.fetchurl {
+  #            url = "https://raw.githubusercontent.com/NixOS/nixpkgs/61acce0cb596050f5fa1c6ebf3f339a893361028/pkgs/servers/mastodon/gemset.nix";
+  #            hash = "sha256-Npny6jwon/xdTMU7xOZSZmiwId5IMDUgno1dG1FGkhA=";
+  #          });
+  #          patches = [
+  #            (final.fetchpatch {
+  #              url = "https://github.com/mastodon/mastodon/compare/v4.2.6...v4.2.7.patch";
+  #              hash = "sha256-8FhlSIHOKIEjq62+rp8QdHY87qMCtDZwjyR0HabdHig=";
+  #            })
+  #          ];
+  #        };
+  #      })
+  # ];
 
   services.mastodon = {
     enable = true;