From cf4279e7fbc810a2c1bc7a5719e1eb4f60d6d4e5 Mon Sep 17 00:00:00 2001
From: yuri <yuri@nekover.se>
Date: Thu, 4 Jul 2024 17:52:01 +0200
Subject: [PATCH] Update mastodo to 4.2.10

---
 config/hosts/mastodon/mastodon.nix | 8 ++++----
 flake.nix                          | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix
index cb13ab5..a1d82d2 100644
--- a/config/hosts/mastodon/mastodon.nix
+++ b/config/hosts/mastodon/mastodon.nix
@@ -1,4 +1,4 @@
-{ pkgs, nixpkgs-unstable, ... }:
+{ pkgs, nixpkgs-mastodon-4-2-10, ... }:
 let
   mastodonNekoversePatches = pkgs.fetchgit {
     url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git";
@@ -6,12 +6,12 @@ let
   };
   mastodonNekoverseOverlay = final: prev: {
     mastodon = (prev.mastodon.override rec {
-      version = "4.2.9";
+      version = "4.2.10";
       srcOverride = final.applyPatches {
         src = final.fetchgit {
           url = "https://github.com/mastodon/mastodon.git";
           rev = "v${version}";
-          sha256 = "sha256-VjR4lXlb1p8mmpOGxPqbmCCEaB7SP90ccPSMfGFx6IQ=";
+          sha256 = "sha256-z3veI0CpZk6mBgygqXk8SN/5WWjy5VkKLxC7nOLnyZE=";
         };
         patches = [
           "${mastodonNekoversePatches}/patches/001_increase_image_dimensions_limit.patch"
@@ -25,7 +25,7 @@ let
       yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE=";
     });
   };
-  pkgs-overlay = nixpkgs-unstable.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
+  pkgs-overlay = nixpkgs-mastodon-4-2-10.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
   vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU=";
 in
 {
diff --git a/flake.nix b/flake.nix
index 5cf2232..876a711 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
+    nixpkgs-mastodon-4-2-10.url = "github:NixOS/nixpkgs/e8f680e000d5c5b4a0ff998e6423951bcf06ba35";
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -10,7 +11,7 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixpkgs-mastodon-4-2-10, nixos-generators, simple-nixos-mailserver, ... }@inputs:
   let
     hosts = import ./hosts.nix inputs;
     helper = import ./helper.nix inputs;
@@ -28,7 +29,7 @@
         nodeNixpkgs = builtins.mapAttrs (name: host: host.pkgs) hosts;
 
         specialArgs = {
-          inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
+          inherit nixpkgs-unstable nixpkgs-master nixpkgs-mastodon-4-2-10 hosts simple-nixos-mailserver;
 
           # Provide environment for secret key command
           keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ];
@@ -38,7 +39,7 @@
 
     hydraJobs = {
       nixConfigurations = builtins.mapAttrs (host: helper.generateNixConfiguration host {
-        inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
+        inherit nixpkgs-unstable nixpkgs-master nixpkgs-mastodon-4-2-10 hosts simple-nixos-mailserver;
       }) hosts;
     };