diff --git a/config/hosts/jellyseerr/configuration.nix b/config/hosts/jellyseerr/configuration.nix index cf03358..05b8f3f 100644 --- a/config/hosts/jellyseerr/configuration.nix +++ b/config/hosts/jellyseerr/configuration.nix @@ -10,7 +10,6 @@ firewall = { allowedTCPPorts = [ 80 443 ]; }; - nameservers = [ "193.138.218.74" ]; extraHosts = '' 10.202.46.101 jellyfin.grzb.de @@ -19,10 +18,5 @@ ''; }; - services.resolved = { - enable = true; - fallbackDns = [ ]; - }; - system.stateVersion = "23.11"; } diff --git a/config/hosts/jellyseerr/jellyseerr.nix b/config/hosts/jellyseerr/jellyseerr.nix index 8e406b0..bd473b0 100644 --- a/config/hosts/jellyseerr/jellyseerr.nix +++ b/config/hosts/jellyseerr/jellyseerr.nix @@ -1,15 +1,6 @@ -{ pkgs, ... }: -let - jellyseerrOverlay = final: prev: { - jellyseerr = prev.jellyseerr.overrideAttrs (finalAttr: previousAttr: { - dontCheckForBrokenSymlinks = true; - }); - }; - pkgs-overlay = pkgs.extend jellyseerrOverlay; -in +{ ... }: { services.jellyseerr = { enable = true; - package = pkgs-overlay.jellyseerr; }; } diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index d8ba670..5aa22ad 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.4"; + version = "4.3.3"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-2FpiFSK9CBm7eHqVvV8pPp6fLc5jCcUektpSyxNnXtw="; + sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; @@ -50,6 +50,14 @@ let ]; }; yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; + }).overrideAttrs (old: { + mastodonModules = old.mastodonModules.overrideAttrs (old: { + # FIXME: Remove once fixed in nixpkgs. See https://github.com/NixOS/nixpkgs/issues/380366 + postBuild = '' + # Remove workspace "package" as it contains broken symlinks + rm -r ~/node_modules/@mastodon + ''; + }); }); }; pkgs-overlay = pkgs.extend mastodonNekoverseOverlay; diff --git a/flake.lock b/flake.lock index b83d314..9645052 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741237477, - "narHash": "sha256-WU1ktX7V2RwyPS0BSgdOjHc0vc/rDJtr22tzd5u3t+U=", + "lastModified": 1739188370, + "narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1907ea1e8f63d206c8bf7991552a539f8a4baeaa", + "rev": "8ae4ee7978617d3af98721a62f14f25befc0beef", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1741277795, - "narHash": "sha256-rS7qyqAQp6h0t3aS+FQgzliGV+Omh/4TdVnVnRSsGvg=", + "lastModified": 1739319052, + "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14a4a1f82773653ac1ac16ed577e42d927380802", + "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741241576, - "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", + "lastModified": 1739303263, + "narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", + "rev": "6cc4213488e886db863878a1e3dc26cc932d38b8", "type": "github" }, "original": { diff --git a/hosts.nix b/hosts.nix index 1dfc6fc..fc029b7 100644 --- a/hosts.nix +++ b/hosts.nix @@ -39,7 +39,6 @@ in environment = "proxmox"; }; jellyfin = { - hostNixpkgs = nixpkgs-unstable; site = "vs"; environment = "proxmox"; };