From 09594b5d07a651458f862fd34a3999f9ef3fe9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 23 May 2026 14:02:38 +0200
Subject: [PATCH 1/2] pihole: fix nix-update, move meta before passhtru

---
 pkgs/by-name/pi/pihole/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index 241f3da8007c..f0bd8fa7eeea 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -231,6 +231,11 @@
       ];
     };
 
+  passthru = {
+    inherit stateDir;
+    tests = nixosTests.pihole-ftl;
+  };
+
   meta = {
     description = "Black hole for Internet advertisements";
     homepage = "https://pi-hole.net";
@@ -240,12 +245,11 @@
     platforms = lib.platforms.linux;
     mainProgram = "pihole";
   };
-
-  passthru.tests = nixosTests.pihole-ftl;
-
-  passthru = { inherit stateDir; };
 })).overrideAttrs
   (old: {
+    # fixes nix-update trying to update resholve instead of this package
+    inherit (old) version src;
+
     # Resholve can't fix the hardcoded absolute paths, so substitute them before resholving
     preFixup = ''
       scriptsDir=$out/share/pihole

From e34409871f9c3e43b54334b7b5ea28b69100599f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 23 May 2026 14:03:23 +0200
Subject: [PATCH 2/2] pihole: 6.4 -> 6.4.2

Changelog: https://github.com/pi-hole/pi-hole/releases/tag/v6.4.2
---
 pkgs/by-name/pi/pihole/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index f0bd8fa7eeea..1193090e415d 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -32,13 +32,13 @@
 
 (resholve.mkDerivation (finalAttrs: {
   pname = "pihole";
-  version = "6.4";
+  version = "6.4.2";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "pi-hole";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aBQO+wAqeuXc9ekByVFlOZQ9SBCGsozGdoS8r1qhGuk=";
+    hash = "sha256-A34LLXI+hmDNXN4MoLLlC9tW3xx+v/1La/qzFSDW0xQ=";
   };
 
   patches = [