From b7657db2cb9415f64163bd72d03232729f704a8e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 18 Nov 2023 18:43:32 +0100 Subject: [PATCH 1/3] chore: bump flake inputs, remove mastodon-fork input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Removed input 'mastodon-fork' • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8' (2023-11-14) → 'github:nixos/nixpkgs/9fb122519e9cd465d532f736a98c1e1eb541ef6f' (2023-11-16) • Updated input 'unstable': 'github:nixos/nixpkgs/e44462d6021bfe23dfb24b775cc7c390844f773d' (2023-11-12) → 'github:nixos/nixpkgs/c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad' (2023-11-17) --- flake.lock | 29 ++++++----------------------- flake.nix | 1 - 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index fdf079b6..7c8c8f48 100644 --- a/flake.lock +++ b/flake.lock @@ -181,22 +181,6 @@ "url": "https://git.pub.solar/pub-solar/keycloak-theme" } }, - "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": { "inputs": { "nixpkgs": [ @@ -235,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699994397, - "narHash": "sha256-xxNeIcMNMXH2EA9IAX6Cny+50mvY22LhIBiGZV363gc=", + "lastModified": 1700097215, + "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8", + "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f", "type": "github" }, "original": { @@ -290,7 +274,6 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "keycloak-theme-pub-solar": "keycloak-theme-pub-solar", - "mastodon-fork": "mastodon-fork", "nix-darwin": "nix-darwin", "nixos-flake": "nixos-flake", "nixpkgs": "nixpkgs", @@ -355,11 +338,11 @@ }, "unstable": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5627cb82..11ee5b33 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ # Track channels with commits tested and built by hydra nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - mastodon-fork.url = "github:teutat3s/nixpkgs/mastodon-4.2.1"; nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05"; From eeb15c93fccc09d0f67be6a63ca05589c31cbcce Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 18 Nov 2023 18:45:58 +0100 Subject: [PATCH 2/3] feat: update forgejo to version 1.20.5-0 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-20-5-0 --- overlays/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/overlays/default.nix b/overlays/default.nix index 537e17b3..86a21e1a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,6 +9,7 @@ nixpkgs.overlays = [ (final: prev: { mastodon = inputs.mastodon-fork.legacyPackages.${prev.system}.mastodon; + forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo; forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner; mediawiki = inputs.unstable.legacyPackages.${prev.system}.mediawiki; From 37176a52ce999f43bd2382e05455daae77d4c148 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 18 Nov 2023 18:46:23 +0100 Subject: [PATCH 3/3] feat: mastodon module updates from nixos-unstable Pull in changes from https://github.com/NixOS/nixpkgs/pull/251950 early --- hosts/nachtigall/apps/mastodon.nix | 7 +++---- hosts/nachtigall/default.nix | 8 +++++++- overlays/default.nix | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hosts/nachtigall/apps/mastodon.nix b/hosts/nachtigall/apps/mastodon.nix index 0dbdc473..06087d98 100644 --- a/hosts/nachtigall/apps/mastodon.nix +++ b/hosts/nachtigall/apps/mastodon.nix @@ -40,10 +40,9 @@ # Different from WEB_DOMAIN in our case localDomain = "pub.solar"; enableUnixSocket = true; - # Processes used by the mastodon-streaming service. Defaults to the number - # of CPU cores minus one - # This is without affect until this comment is addressed - # https://github.com/NixOS/nixpkgs/pull/251950#issuecomment-1732568492 + # Number of processes used by the mastodon-streaming service + # Recommended is the amount of your CPU cores minus one + # On our current 8-Core system, let's start with 5 for now streamingProcesses = 5; # Processes used by the mastodon-web service webProcesses = 2; diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix index 88003567..8fd02dfa 100644 --- a/hosts/nachtigall/default.nix +++ b/hosts/nachtigall/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ flake, ... }: { imports = @@ -28,5 +28,11 @@ ./apps/matrix/mautrix-telegram.nix ./apps/matrix/synapse.nix ./apps/nginx-matrix.nix + + "${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix" + ]; + + disabledModules = [ + "services/web-apps/mastodon.nix" ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 86a21e1a..3ebaefa0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,7 +8,7 @@ overlays = ({ ... }: { nixpkgs.overlays = [ (final: prev: { - mastodon = inputs.mastodon-fork.legacyPackages.${prev.system}.mastodon; + mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon; forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo; forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner;