config/hosts/mastodon/mastodon.nix

@@ -2,8 +2,8 @@
 let
   tangerineUI = pkgs.fetchgit {
     url = "https://github.com/mattbirchler/Tangerine-Neue-for-Mastodon.git";
-    rev = "2.6.5";
+    rev = "2.6.4";
-    hash = "sha256-exooAB0vb1cai2lS99G3LnN2bGpHng5NlvNW7wfrYyM=";
+    hash = "sha256-yNzG7GWliWcXin1CbiQvu4euLAJ8x+r09zBWudey+84=";
   };
   mastodonModern = pkgs.fetchgit {
     url = "https://git.gay/freeplay/Mastodon-Modern.git";
@@ -12,18 +12,18 @@ let
   };
   mastodonNekoversePatches = pkgs.fetchgit {
     url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git";
-    hash = "sha256-JU9Ej4TFZPGU3s/k3vIKkmnS2RcxVEQuDtQIrQCyL/0=";
+    hash = "sha256-R9YWjJYcPxFQk1eS85jVcYLolez8M828TSwp0AeplLc=";
   };
   mastodonNekoverseOverlay = final: prev: {
     mastodon = (prev.mastodon.override rec {
-      version = "4.7.3";
+      version = "4.6.8";
       srcOverride = final.applyPatches {
         src = pkgs.stdenv.mkDerivation {
           name = "mastodonWithThemes";
           src = pkgs.fetchgit {
             url = "https://github.com/mastodon/mastodon.git";
             rev = "v${version}";
-            sha256 = "sha256-cKLjdk5FWcM4e5bh2P0W2UDP+9CKI6FgHH9vDnjg2xQ=";
+            sha256 = "sha256-fDbQunhcpnMnIufEX2oRH9vulsHjtlR95boj0M2O3CQ=";
           };
           # mastodon ships with broken symlinks, disable the check for that for now
           dontCheckForBrokenSymlinks = true;
@@ -47,14 +47,13 @@ let
           "${mastodonNekoversePatches}/patches/004_improve_custom_emoji_support.patch"
           "${mastodonNekoversePatches}/patches/005_increase_profile_limits.patch"
           "${mastodonNekoversePatches}/patches/006_increase_toot_character_limit.patch"
-          "${mastodonNekoversePatches}/patches/007_increase_poll_option_character_limit.patch"
         ];
       };
       yarnHash = prev.mastodon.src.yarnHash;
       yarnMissingHashes = prev.mastodon.src.yarnMissingHashes;
     });
   };
-  pkgs-overlay = nixpkgs-unstable.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
+  pkgs-overlay = nixpkgs-master.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;
   vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU=";
 in
 {

flake.lock

@@ -16,27 +16,6 @@
         "type": "gitlab"
       }
     },
-    "colmena": {
-      "inputs": {
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs",
-        "stable": "stable",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1790716853,
-        "narHash": "sha256-IT0OZW81jngocoxi9Gg2CTSGOC1O6qLioW17nevqIUk=",
-        "owner": "nix-community",
-        "repo": "colmena",
-        "rev": "524ddd89f62721a92e8629063d347e7a1ed390de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "colmena",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -101,27 +80,6 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "colmena",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737420293,
-        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1736643958,
@@ -160,27 +118,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1790578696,
+        "lastModified": 1789485310,
-        "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
+        "narHash": "sha256-VsDMTLSkAAJmbNha6sGNzlF33X7RESWLl3SnjDQu+4U=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
+        "rev": "0c32f40fe3e2a9adfc427fd5abc061a31043ea44",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05-small",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1791311293,
+        "lastModified": 1789497620,
-        "narHash": "sha256-IB+BQRZ3sjZrbTloFMD9jZ3KIHao7ZiX6gHoKH7VEFo=",
+        "narHash": "sha256-PsWLzbk7jyBO6qDxCBOe3/+7zL6CpQgSfWhPmP37B5I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "42b6c9dcfc912918101d29cd6d327d780aa008a7",
+        "rev": "401fcc751fe4f8cd8ca584c851363398099479a6",
         "type": "github"
       },
       "original": {
@@ -192,11 +150,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1791306635,
+        "lastModified": 1789458440,
-        "narHash": "sha256-Nqzt5UdV1P3iKJdVuKOoQZ2h5TkvrAXl8Oy/ZLmsxSc=",
+        "narHash": "sha256-Zq3ebjGURKGrgEWGFw35hrQjTM9MSxzuRhhJFA1rEdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17841f937d296c623ce015c56fe3fa89e3d52107",
+        "rev": "7a1ebacb35eba7648fc5bb28020dc0ee76a21d5c",
         "type": "github"
       },
       "original": {
@@ -207,22 +165,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1791274207,
-        "narHash": "sha256-uJMLBTODypm3xNWa9hXaRKjGDWhjd+fUFsfcXE/G700=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c71914ac4db6642e49a327270d414efbd94ecda9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-26.05-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1779622335,
         "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=",
@@ -240,9 +182,8 @@
     },
     "root": {
       "inputs": {
-        "colmena": "colmena",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
@@ -254,7 +195,7 @@
         "blobs": "blobs",
         "flake-compat": "flake-compat",
         "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1785198005,
@@ -278,11 +219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791103873,
+        "lastModified": 1788914643,
-        "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=",
+        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "dcd241ba97088c22569d1573286e1b9daad340c0",
+        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
         "type": "github"
       },
       "original": {
@@ -290,37 +231,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "stable": {
-      "locked": {
-        "lastModified": 1790608446,
-        "narHash": "sha256-CYsYyk0zInkpQ6ojuCpvb9MahlhFXkeZpzjOU9Lxkpk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c619be20e3508300c88af8aeafeaa7017559313f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1776166891,
-        "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=",
-        "owner": "nix-systems",
-        "repo": "triplet",
-        "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "triplet",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,6 +1,5 @@
 {
   inputs = {
-    colmena.url = "github:nix-community/colmena";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
@@ -15,13 +14,11 @@
     };
   };
 
-  outputs = { self, colmena, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, sops-nix, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, sops-nix, ... }@inputs:
   let
     hosts = import ./hosts.nix inputs;
     helper = import ./helper.nix inputs;
   in {
-    colmenaHive = colmena.lib.makeHive self.outputs.colmena;
-
     colmena = {
       meta = {
         # Set the default pkgs, which is pointless in this case,
@@ -40,7 +37,6 @@
       };
     } // builtins.mapAttrs (helper.generateColmenaHost) hosts;
 
-
     # Generate a base VM image for Proxmox with `nix build .#base-proxmox`
     packages.x86_64-linux = {
       base-proxmox = nixos-generators.nixosGenerate {