feat: use mastodon version 4.2.1 from our fork

This still needs updates in the NixOS module to account for the changes
in https://github.com/mastodon/mastodon/pull/24655 that change how
multiple streaming processes run. Hopefully this is fine for a single
streaming process though.

https://github.com/NixOS/nixpkgs/pull/251950
https://github.com/teutat3s/nixpkgs/tree/mastodon-4.2.1
This commit is contained in:
teutat3s 2023-10-28 15:36:13 +02:00
parent 65689ae524
commit e43cb021ce
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 38 additions and 1 deletions

View file

@ -150,6 +150,22 @@
"type": "github" "type": "github"
} }
}, },
"mastodon-fork": {
"locked": {
"lastModified": 1698490885,
"narHash": "sha256-Ic2YgJ7vlAoiihho4pJgHewIubIZQpv1L8ePRB1wfG4=",
"owner": "teutat3s",
"repo": "nixpkgs",
"rev": "534d90c65614f05e543fd11b3f4acd748704a625",
"type": "github"
},
"original": {
"owner": "teutat3s",
"ref": "mastodon-4.2.1",
"repo": "nixpkgs",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -226,6 +242,7 @@
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"mastodon-fork": "mastodon-fork",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-flake": "nixos-flake", "nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View file

@ -3,6 +3,7 @@
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
mastodon-fork.url = "github:teutat3s/nixpkgs/mastodon-4.2.1";
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
@ -34,6 +35,7 @@
# ./terraform.nix # ./terraform.nix
./public-keys ./public-keys
./lib ./lib
./overlays
]; ];
perSystem = { system, pkgs, config, ... }: { perSystem = { system, pkgs, config, ... }: {
@ -79,6 +81,7 @@
self.pub-solar.lib.linux.unlockZFSOnBoot self.pub-solar.lib.linux.unlockZFSOnBoot
self.nixosModules.home-manager self.nixosModules.home-manager
self.nixosModules.linux self.nixosModules.linux
self.nixosModules.overlays
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
{ {
home-manager.users.${username} = { home-manager.users.${username} = {

View file

@ -1,4 +1,4 @@
{ config, pkgs, flake, ... }: { config, pkgs, flake, inputs, ... }:
{ {
age.secrets."mastodon-secret-key-base" = { age.secrets."mastodon-secret-key-base" = {

17
overlays/default.nix Normal file
View file

@ -0,0 +1,17 @@
{
self,
inputs,
...
}: {
flake = {
nixosModules = rec {
overlays = ({ ... }: {
nixpkgs.overlays = [
(final: prev: {
mastodon = inputs.mastodon-fork.legacyPackages.${prev.system}.mastodon;
})
];
});
};
};
}