From dfb523133e0c396a2332333a21c9862493f760bb Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 8 Jul 2024 18:36:48 +0200
Subject: [PATCH] mastodon: remove overlay for security update, new

version landed in NixOS 24.05
---
 flake.lock           | 17 -----------------
 flake.nix            |  1 -
 overlays/default.nix | 16 ----------------
 3 files changed, 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index a2ae4ff0..20d4755d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -360,22 +360,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-head": {
-      "locked": {
-        "lastModified": 1720453862,
-        "narHash": "sha256-iQcYpFRFzQV/lN6eqrHWMKmMMkGbJl3eY+piZ67ZKqU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "acbecbb607c70bddfc5938b61cedbff3cfb1fc39",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1719876945,
@@ -402,7 +386,6 @@
         "nixos-flake": "nixos-flake",
         "nixpkgs": "nixpkgs",
         "nixpkgs-2205": "nixpkgs-2205",
-        "nixpkgs-head": "nixpkgs-head",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "triton-vmtools": "triton-vmtools",
         "unstable": "unstable"
diff --git a/flake.nix b/flake.nix
index 1e9c3f3e..b5473e13 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,6 @@
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
-    nixpkgs-head.url = "github:nixos/nixpkgs/release-24.05";
 
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/overlays/default.nix b/overlays/default.nix
index 5e60e51b..af9faa9b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -16,22 +16,6 @@
                 element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker {
                   inherit (inputs) element-stickers maunium-stickerpicker;
                 };
-                mastodon = prev.mastodon.override {
-                  version = "4.2.10";
-                  patches = [
-                    (final.fetchpatch {
-                      url = "https://github.com/mastodon/mastodon/compare/v4.2.9...v4.2.10.patch";
-                      hash = "sha256-268iq+2E5OOlhaJE1u5q7AFPdsloXpZCEXoyRMLtRys=";
-                    })
-                  ];
-
-                  # Mastodon has been upgraded on master, the backport is still
-                  # in progress. This is a temporary hack until the backport
-                  # makes it to the branch nixos-24.05.
-                  # https://github.com/NixOS/nixpkgs/pull/324587
-                  # https://nixpk.gs/pr-tracker.html?pr=324587
-                  gemset = import "${inputs.nixpkgs-head.sourceInfo.outPath}/pkgs/servers/mastodon/gemset.nix";
-                };
               }
             )
           ];