From 3e2fcee3f3355591c9e0a44ef6f1360271d593b7 Mon Sep 17 00:00:00 2001 From: fi Date: Fri, 14 Nov 2025 20:08:21 +0100 Subject: [PATCH 01/12] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ca534a76c4afb2bdc07b681dbc11b453bab21af8?narHash=sha256-cGS3lLTYusbEP/IJIWGgnkzIl%2BFA5xDvtiHyjalGr4k%3D' (2025-11-04) → 'github:NixOS/nixpkgs/3acb677ea67d4c6218f33de0db0955f116b7588c?narHash=sha256-A5LS0AJZ1yDPTa2fHxufZN%2B%2Bn8MCmtgrJDtxFxrH4S8%3D' (2025-11-13) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/1c7d766a851aa33a22b85819fd1b8189dc23484d?narHash=sha256-d3CvyL0DK%2Bp9Ys5IeFcRBIxGWhB8btqWboupDeEowGY%3D' (2025-11-04) → 'github:NixOS/nixpkgs/81cdad058cb55d54601d64b6fdd1442c31ed9a0e?narHash=sha256-XgE/RScj/mgG1icixlHoI23j01Kj4ZEAqxbVLZ1jRHY%3D' (2025-11-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/f646317c4052d86e5e5ffb00c88202ebd00d9920?narHash=sha256-0td4fZg9NGBOStEqhHmB4Rle/ySBs/z9zBN6zofkx28%3D' (2025-11-04) → 'github:NixOS/nixpkgs/534d5ee716a5f547efa4f3563d3592527e30329c?narHash=sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk%3D' (2025-11-14) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a9662ff..dc99fb4 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1762286556, - "narHash": "sha256-d3CvyL0DK+p9Ys5IeFcRBIxGWhB8btqWboupDeEowGY=", + "lastModified": 1763146437, + "narHash": "sha256-XgE/RScj/mgG1icixlHoI23j01Kj4ZEAqxbVLZ1jRHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c7d766a851aa33a22b85819fd1b8189dc23484d", + "rev": "81cdad058cb55d54601d64b6fdd1442c31ed9a0e", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762254973, - "narHash": "sha256-0td4fZg9NGBOStEqhHmB4Rle/ySBs/z9zBN6zofkx28=", + "lastModified": 1763101017, + "narHash": "sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f646317c4052d86e5e5ffb00c88202ebd00d9920", + "rev": "534d5ee716a5f547efa4f3563d3592527e30329c", "type": "github" }, "original": { From 080ec238afcb70de200749d55d8e86d964c845ef Mon Sep 17 00:00:00 2001 From: fi Date: Fri, 14 Nov 2025 20:32:21 +0100 Subject: [PATCH 02/12] Update mastodon to 4.5.1 --- config/hosts/mastodon/mastodon.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 03ede5a..c467aaf 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -2,13 +2,13 @@ let tangerineUI = pkgs.fetchgit { url = "https://github.com/nileane/TangerineUI-for-Mastodon.git"; - rev = "v2.4.4"; - hash = "sha256-58xiS2yzv4z24IULJQWpkqV1Op6e+U6SFd1XjpAB6Go="; + rev = "v2.5.2"; + hash = "sha256-RJPP3QynE42cr9Km8twyZrHiZnhMdNcYOOJ7nW0mx1c="; }; mastodonModern = pkgs.fetchgit { url = "https://git.gay/freeplay/Mastodon-Modern.git"; - rev = "9f8db85eda2a65aa020ab6b81d100a121d39d4c4"; - hash = "sha256-W6zwjAjBGARiRPM0hWCnq63nIT2Or0SOQq82bpNtqAk="; + rev = "f899b68740e25e17ed600e38657d0ef94c92b293"; + hash = "sha256-+HQ7+Ypv540qB7ACfROJs8JUuqvMzaveKOdBsAfr3D4="; }; mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.4.8"; + version = "4.5.1"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-EE0A9EH+8ND9Whig2dhM27EONjJfdVtd9g+Mo0/2iHo="; + sha256 = "sha256-bMOM8i67z0rJXnTnh45TCrwLwbyFTImdePEVVoZiwlo="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; From 8b77074ebe20fac4ee7d3031760515c1cfa4ab20 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 19:00:08 +0100 Subject: [PATCH 03/12] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/032decf9db65efed428afd2fa39d80f7089085eb?narHash=sha256-PeSkNMvkpEvts%2B9DjFiop1iT2JuBpyknmBUs0Un0a4I%3D' (2025-07-07) → 'github:nix-community/nixos-generators/032a1878682fafe829edfcf5fdfad635a2efe748?narHash=sha256-NHF7QWa0ZPT8hsJrvijREW3%2BnifmF2rTXgS2v0tpcEA%3D' (2025-11-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3acb677ea67d4c6218f33de0db0955f116b7588c?narHash=sha256-A5LS0AJZ1yDPTa2fHxufZN%2B%2Bn8MCmtgrJDtxFxrH4S8%3D' (2025-11-13) → 'github:NixOS/nixpkgs/5e83999b283124d10c3a01ecdd91fe29983ab616?narHash=sha256-tYoJbkKNjMaPNAUL/h8zTxbHW%2BOmh16wWgXoGOp%2BrxQ%3D' (2025-12-08) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/81cdad058cb55d54601d64b6fdd1442c31ed9a0e?narHash=sha256-XgE/RScj/mgG1icixlHoI23j01Kj4ZEAqxbVLZ1jRHY%3D' (2025-11-14) → 'github:NixOS/nixpkgs/864b51ebb4d1143e83d05594ab8d7669f058d5d3?narHash=sha256-7wA00baZ6078KF2nRA77qXqQgg6FkQ%2BONNk/ASyhDe4%3D' (2025-12-08) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/534d5ee716a5f547efa4f3563d3592527e30329c?narHash=sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk%3D' (2025-11-14) → 'github:NixOS/nixpkgs/fc2de1563f89f0843eba27f14576d261df0e3b80?narHash=sha256-TBA7CE44IHYfvOPBWcyLncpVrrKEiXWPdOrF8CD6W84%3D' (2025-12-08) • Updated input 'simple-nixos-mailserver': 'gitlab:simple-nixos-mailserver/nixos-mailserver/f5936247dbdb8501221978562ab0b302dd75456c?narHash=sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI%3D' (2025-08-13) → 'gitlab:simple-nixos-mailserver/nixos-mailserver/5b38fb599f50e9d78325d1d2706e36303c166047?narHash=sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j%2B1q7zRz%2BnRraSFE%3D' (2025-11-16) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index dc99fb4..3c9edb4 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1765170560, + "narHash": "sha256-tYoJbkKNjMaPNAUL/h8zTxbHW+Omh16wWgXoGOp+rxQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "5e83999b283124d10c3a01ecdd91fe29983ab616", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763146437, - "narHash": "sha256-XgE/RScj/mgG1icixlHoI23j01Kj4ZEAqxbVLZ1jRHY=", + "lastModified": 1765214987, + "narHash": "sha256-7wA00baZ6078KF2nRA77qXqQgg6FkQ+ONNk/ASyhDe4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "81cdad058cb55d54601d64b6fdd1442c31ed9a0e", + "rev": "864b51ebb4d1143e83d05594ab8d7669f058d5d3", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763101017, - "narHash": "sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk=", + "lastModified": 1765183668, + "narHash": "sha256-TBA7CE44IHYfvOPBWcyLncpVrrKEiXWPdOrF8CD6W84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "534d5ee716a5f547efa4f3563d3592527e30329c", + "rev": "fc2de1563f89f0843eba27f14576d261df0e3b80", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1755110674, - "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", + "lastModified": 1763302796, + "narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "f5936247dbdb8501221978562ab0b302dd75456c", + "rev": "5b38fb599f50e9d78325d1d2706e36303c166047", "type": "gitlab" }, "original": { From 6f4daa0d5b71230ef119365c129720a96011c42d Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 19:25:04 +0100 Subject: [PATCH 04/12] Update mastodon to 4.5.2 --- config/hosts/mastodon/mastodon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index c467aaf..aa4fea4 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.5.1"; + version = "4.5.2"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-bMOM8i67z0rJXnTnh45TCrwLwbyFTImdePEVVoZiwlo="; + sha256 = "sha256-LePly+CcM+Dv6ipX9jIWWKhy2PiF1j8vgc9CXn2o+DQ="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; From 0615cc812444fd6d1b9a73c52043194cf546a065 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 19:31:08 +0100 Subject: [PATCH 05/12] Update matrix synapse alertmanager rules --- config/hosts/metrics/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hosts/metrics/prometheus.nix b/config/hosts/metrics/prometheus.nix index 0163c43..53e313c 100644 --- a/config/hosts/metrics/prometheus.nix +++ b/config/hosts/metrics/prometheus.nix @@ -3,7 +3,7 @@ let # https://github.com/element-hq/synapse/tree/master/contrib/prometheus/ synapseRules = pkgs.fetchurl { url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/prometheus/synapse-v2.rules"; - hash = "sha256-WldlBdCMzul49OlFhJMsrx4MYFakHTa36Y9HnV22EwI="; + hash = "sha256-X6GHOUDIMUat7R/yIfrIdO8ehomYiwDBFe3TUQYXDWQ="; }; in { From 9a9555432424c146d76ea31fe0ec362ec27b9a43 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 22:07:55 +0100 Subject: [PATCH 06/12] Update nixpkgs to 25.11 --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a2a822f..2841638 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; }; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; }; outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixos-generators, simple-nixos-mailserver, ... }@inputs: From 704f9dba22be125b4d5afe426fa8967e0da064f8 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 22:08:53 +0100 Subject: [PATCH 07/12] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e83999b283124d10c3a01ecdd91fe29983ab616?narHash=sha256-tYoJbkKNjMaPNAUL/h8zTxbHW%2BOmh16wWgXoGOp%2BrxQ%3D' (2025-12-08) → 'github:NixOS/nixpkgs/f376a52d0dc796aec60b5606a2676240ff1565b9?narHash=sha256-Kb3mIrj4xLg2LeMvok0tpiGPis1VnrNJO0l4kW%2B0xmc%3D' (2025-12-08) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/864b51ebb4d1143e83d05594ab8d7669f058d5d3?narHash=sha256-7wA00baZ6078KF2nRA77qXqQgg6FkQ%2BONNk/ASyhDe4%3D' (2025-12-08) → 'github:NixOS/nixpkgs/a0ea537a4fc4c49fb1e226317829c8b32ed95d0e?narHash=sha256-OeTF3YNuXZxN4TxluVEdCG32e5/0pYDb5exWe0RrQBY%3D' (2025-12-08) • Updated input 'simple-nixos-mailserver': 'gitlab:simple-nixos-mailserver/nixos-mailserver/5b38fb599f50e9d78325d1d2706e36303c166047?narHash=sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j%2B1q7zRz%2BnRraSFE%3D' (2025-11-16) → 'gitlab:simple-nixos-mailserver/nixos-mailserver/a14fe3b293ec2720e5b7fc72ad136d22967e12ba?narHash=sha256-%2BHUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo%3D' (2025-11-26) • Updated input 'simple-nixos-mailserver/flake-compat': 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885?narHash=sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX%2BfjA8Xf8PUmqCY%3D' (2025-05-12) → 'github:edolstra/flake-compat/f387cd2afec9419c8ee37694406ca490c3f34ee5?narHash=sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4%3D' (2025-10-27) • Updated input 'simple-nixos-mailserver/git-hooks': 'github:cachix/git-hooks.nix/dcf5072734cb576d2b0c59b2ac44f5050b5eac82?narHash=sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco%3D' (2025-03-22) → 'github:cachix/git-hooks.nix/7275fa67fbbb75891c16d9dee7d88e58aea2d761?narHash=sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA%3D' (2025-11-16) • Updated input 'simple-nixos-mailserver/nixpkgs': 'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D' (2025-05-13) → 'github:NixOS/nixpkgs/a320ce8e6e2cc6b4397eef214d202a50a4583829?narHash=sha256-6zddwDs2n%2Bn01l%2B1TG6PlyokDdXzu/oBmEejcH5L5%2BA%3D' (2025-11-24) • Removed input 'simple-nixos-mailserver/nixpkgs-25_05' --- flake.lock | 61 ++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 3c9edb4..1ba87cf 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -118,43 +118,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765170560, - "narHash": "sha256-tYoJbkKNjMaPNAUL/h8zTxbHW+Omh16wWgXoGOp+rxQ=", + "lastModified": 1765178948, + "narHash": "sha256-Kb3mIrj4xLg2LeMvok0tpiGPis1VnrNJO0l4kW+0xmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e83999b283124d10c3a01ecdd91fe29983ab616", + "rev": "f376a52d0dc796aec60b5606a2676240ff1565b9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1765214987, - "narHash": "sha256-7wA00baZ6078KF2nRA77qXqQgg6FkQ+ONNk/ASyhDe4=", + "lastModified": 1765227377, + "narHash": "sha256-OeTF3YNuXZxN4TxluVEdCG32e5/0pYDb5exWe0RrQBY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "864b51ebb4d1143e83d05594ab8d7669f058d5d3", + "rev": "a0ea537a4fc4c49fb1e226317829c8b32ed95d0e", "type": "github" }, "original": { @@ -182,16 +166,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } @@ -210,20 +194,19 @@ "blobs": "blobs", "flake-compat": "flake-compat", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2", - "nixpkgs-25_05": "nixpkgs-25_05" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763302796, - "narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=", + "lastModified": 1764185122, + "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "5b38fb599f50e9d78325d1d2706e36303c166047", + "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixos-mailserver", "type": "gitlab" } From 7817151ed95b82c5d1935b28a9d3bba2c92e76e9 Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 22:28:13 +0100 Subject: [PATCH 08/12] Set mailserver stateVersion --- config/hosts/mail-1/simple-nixos-mailserver.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix index c08a1a3..0f8d76f 100644 --- a/config/hosts/mail-1/simple-nixos-mailserver.nix +++ b/config/hosts/mail-1/simple-nixos-mailserver.nix @@ -4,6 +4,7 @@ simple-nixos-mailserver.nixosModule { mailserver = { enable = true; + stateVersion = 1; openFirewall = true; fqdn = "mail-1.grzb.de"; enableImap = false; From fde35d287ac83ec0d31e97ef329a3162608a005e Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 22:37:13 +0100 Subject: [PATCH 09/12] replace services.postfix.extraConfig with services.postfix.settings.main option --- config/hosts/mail-1/simple-nixos-mailserver.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix index 0f8d76f..9bcbe46 100644 --- a/config/hosts/mail-1/simple-nixos-mailserver.nix +++ b/config/hosts/mail-1/simple-nixos-mailserver.nix @@ -75,8 +75,8 @@ services.postfix = { transport = "relay:[mail-2.grzb.de]"; - extraConfig = '' - proxy_interfaces = 212.53.203.19 - ''; + settings.main = { + proxy_interfaces = "212.53.203.19"; + }; }; } From 3868f102fa5cad33e1826eb2ca51c1ee6bae300f Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 23:23:17 +0100 Subject: [PATCH 10/12] Bump mailserver stateVersion to 3 --- config/hosts/mail-1/simple-nixos-mailserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix index 9bcbe46..15318e8 100644 --- a/config/hosts/mail-1/simple-nixos-mailserver.nix +++ b/config/hosts/mail-1/simple-nixos-mailserver.nix @@ -4,7 +4,7 @@ simple-nixos-mailserver.nixosModule { mailserver = { enable = true; - stateVersion = 1; + stateVersion = 3; openFirewall = true; fqdn = "mail-1.grzb.de"; enableImap = false; From b4f63bc010b3943915d681f3e0437fc9b9fc93cf Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 23:36:35 +0100 Subject: [PATCH 11/12] change services.nextcloud.settings.mail_smtpauth to boolean --- config/hosts/nextcloud/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hosts/nextcloud/nextcloud.nix b/config/hosts/nextcloud/nextcloud.nix index 69d85d9..88b842a 100644 --- a/config/hosts/nextcloud/nextcloud.nix +++ b/config/hosts/nextcloud/nextcloud.nix @@ -23,7 +23,7 @@ mail_from_address = "cloud"; mail_domain = "nekover.se"; mail_smtpauthtype = "LOGIN"; - mail_smtpauth = 1; + mail_smtpauth = true; mail_smtphost = "mail-1.grzb.de"; mail_smtpport = 465; mail_smtpname = "cloud@nekover.se"; From 0dc30f442f3cbce0a04360b4c9678770775c26af Mon Sep 17 00:00:00 2001 From: fi Date: Mon, 8 Dec 2025 23:44:19 +0100 Subject: [PATCH 12/12] Build with setuptools --- pkgs/wireguard-nat-nftables/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/wireguard-nat-nftables/default.nix b/pkgs/wireguard-nat-nftables/default.nix index 3ce972e..af3f46c 100644 --- a/pkgs/wireguard-nat-nftables/default.nix +++ b/pkgs/wireguard-nat-nftables/default.nix @@ -2,6 +2,8 @@ pkgs.python3Packages.buildPythonApplication { pname = "wireguard-nat-nftables"; version = "0.0.1"; + pyproject = true; + build-system = [ pkgs.python3Packages.setuptools ]; propagatedBuildInputs = with pkgs; [ wireguard-tools