From 43c9825e49d25fbd2c19abcdeb8f73aee8be2a4c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 14 May 2025 10:50:27 +0200
Subject: ...

---
 overlays/cake-prometheus-exporter/default.nix     | 11 +++++------
 overlays/inwx-cdnskey/default.nix                 | 11 +++++------
 overlays/nftables-prometheus-exporter/default.nix | 11 +++++------
 overlays/persistent-nix-shell/default.nix         |  5 ++---
 overlays/postsrsd.nix                             | 11 +++++++++++
 overlays/zte-prometheus-exporter/default.nix      | 11 +++++------
 6 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 overlays/postsrsd.nix

(limited to 'overlays')

diff --git a/overlays/cake-prometheus-exporter/default.nix b/overlays/cake-prometheus-exporter/default.nix
index 3d0acc2d..69a5008c 100644
--- a/overlays/cake-prometheus-exporter/default.nix
+++ b/overlays/cake-prometheus-exporter/default.nix
@@ -1,19 +1,18 @@
 { final, prev, ... }:
 let
   inpPython = final.python310.override {};
+  python = inpPython.withPackages (ps: with ps; []);
 in {
   cake-prometheus-exporter = prev.stdenv.mkDerivation rec {
     pname = "cake-prometheus-exporter";
     version = "0.0.0";
 
-    src = ./cake-prometheus-exporter.py;
+    src = prev.replaceVars ./cake-prometheus-exporter.py { inherit python; };
 
-    phases = [ "buildPhase" "checkPhase" "installPhase" ];
+    phases = [ "unpackPhase" "checkPhase" "installPhase" ];
 
-    python = inpPython.withPackages (ps: with ps; []);
-
-    buildPhase = ''
-      substituteAll $src cake-prometheus-exporter
+    unpackPhase = ''
+      cp $src cake-prometheus-exporter
     '';
 
     doCheck = true;
diff --git a/overlays/inwx-cdnskey/default.nix b/overlays/inwx-cdnskey/default.nix
index cd564f24..e1bee0f2 100644
--- a/overlays/inwx-cdnskey/default.nix
+++ b/overlays/inwx-cdnskey/default.nix
@@ -2,17 +2,16 @@
 let
   packageOverrides = final.callPackage ./python-packages.nix {};
   inpPython = final.python39.override { inherit packageOverrides; };
+  python = inpPython.withPackages (ps: with ps; [pyxdg inwx-domrobot configparser dnspython]);
 in {
   inwx-cdnskey = prev.stdenv.mkDerivation rec {
     name = "inwx-cdnskey";
-    src = ./inwx-cdnskey.py;
+    src = prev.replaceVars ./inwx-cdnskey.py { inherit python; };
 
-    phases = [ "buildPhase" "checkPhase" "installPhase" ];
+    phases = [ "unpackPhase" "checkPhase" "installPhase" ];
 
-    python = inpPython.withPackages (ps: with ps; [pyxdg inwx-domrobot configparser dnspython]);
-
-    buildPhase = ''
-      substituteAll $src inwx-cdnskey
+    unpackPhase = ''
+      cp $src inwx-cdnskey
     '';
 
     doCheck = true;
diff --git a/overlays/nftables-prometheus-exporter/default.nix b/overlays/nftables-prometheus-exporter/default.nix
index aab0c8e9..48f668c4 100644
--- a/overlays/nftables-prometheus-exporter/default.nix
+++ b/overlays/nftables-prometheus-exporter/default.nix
@@ -1,17 +1,16 @@
 { final, prev, ... }:
 let
   inpPython = final.python310;
+  python = inpPython.withPackages (ps: with ps; []);
 in {
   nftables-prometheus-exporter = prev.stdenv.mkDerivation rec {
     name = "nftables-prometheus-exporter";
-    src = ./nftables-prometheus-exporter.py;
+    src = prev.replaceVars ./nftables-prometheus-exporter.py { inherit python; };
 
-    phases = [ "buildPhase" "checkPhase" "installPhase" ];
+    phases = [ "unpackPhase" "checkPhase" "installPhase" ];
 
-    python = inpPython.withPackages (ps: with ps; []);
-
-    buildPhase = ''
-      substituteAll $src nftables-prometheus-exporter
+    unpackPhase = ''
+      cp $src nftables-prometheus-exporter
     '';
 
     doCheck = true;
diff --git a/overlays/persistent-nix-shell/default.nix b/overlays/persistent-nix-shell/default.nix
index c36b9e86..6067cade 100644
--- a/overlays/persistent-nix-shell/default.nix
+++ b/overlays/persistent-nix-shell/default.nix
@@ -5,10 +5,9 @@
 
     phases = [ "buildPhase" "installPhase" ];
 
-    inherit (final) zsh;
-
     buildPhase = ''
-      substituteAll $src persistent-nix-shell
+      substitute $src persistent-nix-shell \
+        --subst-var-by zsh ${final.zsh}
     '';
 
     installPhase = ''
diff --git a/overlays/postsrsd.nix b/overlays/postsrsd.nix
new file mode 100644
index 00000000..cb1ccf30
--- /dev/null
+++ b/overlays/postsrsd.nix
@@ -0,0 +1,11 @@
+{ final, prev, ... }:
+{
+  postsrsd = prev.postsrsd.overrideAttrs (oldAttrs: {
+    cmakeFlags = (oldAttrs.cmakeFlags or []) ++ [
+      "-DWITH_MILTER=ON"
+    ];
+    buildInputs = (oldAttrs.buildInputs or []) ++ [
+      final.libmilter
+    ];
+  });
+}
diff --git a/overlays/zte-prometheus-exporter/default.nix b/overlays/zte-prometheus-exporter/default.nix
index 2188e7b3..cd4207cd 100644
--- a/overlays/zte-prometheus-exporter/default.nix
+++ b/overlays/zte-prometheus-exporter/default.nix
@@ -2,17 +2,16 @@
 let
   packageOverrides = final.callPackage ./python-packages.nix {};
   inpPython = final.python310.override { inherit packageOverrides; };
+  python = inpPython.withPackages (ps: with ps; [pytimeparse requests]);
 in {
   zte-prometheus-exporter = prev.stdenv.mkDerivation rec {
     name = "zte-prometheus-exporter";
-    src = ./zte-prometheus-exporter.py;
+    src = prev.replaceVars ./zte-prometheus-exporter.py { inherit python; };
 
-    phases = [ "buildPhase" "checkPhase" "installPhase" ];
+    phases = [ "unpackPhase" "checkPhase" "installPhase" ];
 
-    python = inpPython.withPackages (ps: with ps; [pytimeparse requests]);
-
-    buildPhase = ''
-      substituteAll $src zte-prometheus-exporter
+    unpackPhase = ''
+      cp $src zte-prometheus-exporter
     '';
 
     doCheck = true;
-- 
cgit v1.2.3