From 02f19e6f6427d0886eab5ab705e631bdfda14e88 Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Sat, 14 Jun 2025 21:20:36 +0200
Subject: [PATCH] fix(ntfy-sh): overlay for taking some 25.05 features

---
 machines/nixos/web01/ntfy-sh.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/machines/nixos/web01/ntfy-sh.nix b/machines/nixos/web01/ntfy-sh.nix
index be82dbc..f8e6bbc 100644
--- a/machines/nixos/web01/ntfy-sh.nix
+++ b/machines/nixos/web01/ntfy-sh.nix
@@ -6,6 +6,7 @@
   config,
   lib,
   meta,
+  nixpkgs,
   ...
 }:
 
@@ -29,18 +30,11 @@ let
   }) ntfy-users;
 in
 {
-  nixpkgs.overlays = [
-    (_: super: {
-      ntfy-sh = super.ntfy-sh.overrideAttrs (o: {
-        patches = o.patches or [ ] ++ [
-          (super.fetchurl {
-            url = "https://github.com/binwiederhier/ntfy/pull/1340.patch";
-            hash = "sha256-pmmpccsrAvByynCKc0CMUrVWzKY+Ai250NIfYCXvbWU=";
-          })
-        ];
-      });
-    })
-  ];
+  nixpkgs.overlays =
+    if meta.nodes."web01".nixpkgs.version == "25.05" then
+      throw "This overlay should be removed"
+    else
+      [ (_: _: { inherit (nixpkgs.nixos."25.05") ntfy-sh replaceVarsWith; }) ];
 
   services.ntfy-sh = {
     enable = true;