From be22bc7847046b35bda83a6a589d1d23082ef395 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Jun 2025 13:00:19 +0000
Subject: [PATCH 1/3] adguardhome: 0.107.62 -> 0.107.63

---
 pkgs/servers/adguardhome/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index da2bacd0ee9c..efdfc94c42bf 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "adguardhome";
-  version = "0.107.62";
+  version = "0.107.63";
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "AdGuardHome";
     tag = "v${version}";
-    hash = "sha256-CqXf19DyDFgSnd/dziUq9Gl1d1V20OWE5MTQMi260Zc=";
+    hash = "sha256-yu+rw1is5Egs1O2mww8MGe48Cl74j7RULm4FB2JhQN4=";
   };
 
-  vendorHash = "sha256-lY24TtW4vpMRUzOZmeX3Ip9ikUc4z1HG49DpeECExdk=";
+  vendorHash = "sha256-9w2P3kNSf8I6tGq3K0ULoV+qeq3rUzrevDC+mktfsis=";
 
   dashboard = buildNpmPackage {
     inherit src;

From e10eed94d8e6d2488ffae8498205b103c7d27e15 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 28 Jun 2025 13:56:34 +0400
Subject: [PATCH 2/3] adguardhome: modernize

---
 pkgs/servers/adguardhome/default.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index efdfc94c42bf..3b2db9ab6b80 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -4,22 +4,23 @@
   buildGoModule,
   buildNpmPackage,
   nixosTests,
+  testers,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "adguardhome";
   version = "0.107.63";
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "AdGuardHome";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yu+rw1is5Egs1O2mww8MGe48Cl74j7RULm4FB2JhQN4=";
   };
 
   vendorHash = "sha256-9w2P3kNSf8I6tGq3K0ULoV+qeq3rUzrevDC+mktfsis=";
 
   dashboard = buildNpmPackage {
-    inherit src;
+    inherit (finalAttrs) src;
     name = "dashboard";
     postPatch = ''
       cd client
@@ -33,25 +34,34 @@ buildGoModule rec {
   };
 
   preBuild = ''
-    cp -r ${dashboard}/build/static build
+    cp -r ${finalAttrs.dashboard}/build/static build
   '';
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/AdguardTeam/AdGuardHome/internal/version.version=${finalAttrs.version}"
+  ];
+
   passthru = {
     updateScript = ./update.sh;
     schema_version = 29;
     tests.adguardhome = nixosTests.adguardhome;
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/AdguardTeam/AdGuardHome";
     description = "Network-wide ads & trackers blocking DNS server";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       numkem
       iagoq
       rhoriguchi
       baksa
     ];
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "AdGuardHome";
   };
-}
+})

From 3a91a993ffcf2b258ad388140de44d8d52e890e0 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 28 Jun 2025 14:49:39 +0400
Subject: [PATCH 3/3] adguardhome: migrate to by-name

---
 .../default.nix => by-name/ad/adguardhome/package.nix}          | 0
 pkgs/{servers => by-name/ad}/adguardhome/update.sh              | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{servers/adguardhome/default.nix => by-name/ad/adguardhome/package.nix} (100%)
 rename pkgs/{servers => by-name/ad}/adguardhome/update.sh (100%)

diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/by-name/ad/adguardhome/package.nix
similarity index 100%
rename from pkgs/servers/adguardhome/default.nix
rename to pkgs/by-name/ad/adguardhome/package.nix
diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/by-name/ad/adguardhome/update.sh
similarity index 100%
rename from pkgs/servers/adguardhome/update.sh
rename to pkgs/by-name/ad/adguardhome/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c3f49361d7b..a106a04f2bb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10099,8 +10099,6 @@ with pkgs;
 
   ### SERVERS
 
-  adguardhome = callPackage ../servers/adguardhome { };
-
   alerta = callPackage ../servers/monitoring/alerta/client.nix { };
 
   alerta-server = callPackage ../servers/monitoring/alerta { };