From 3280b11e5b3d0721a8e6c64273caf55e23a69109 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 02:58:12 +0800
Subject: [PATCH 1/2] dnsviz: 0.9.4 -> 0.11.1

Diff: https://github.com/dnsviz/dnsviz/compare/v0.9.4...v0.11.1
---
 pkgs/tools/networking/dnsviz/default.nix    | 30 ++++++++++-----------
 pkgs/tools/networking/dnsviz/fix-path.patch |  6 ++---
 pkgs/top-level/all-packages.nix             |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix
index 46a9617cc2cc..bba786016014 100644
--- a/pkgs/tools/networking/dnsviz/default.nix
+++ b/pkgs/tools/networking/dnsviz/default.nix
@@ -1,21 +1,18 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  dnspython,
-  m2crypto,
-  pygraphviz,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "dnsviz";
-  version = "0.9.4";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "dnsviz";
     repo = "dnsviz";
-    rev = "v${version}";
-    sha256 = "sha256-x6LdPVQFfsJIuKde1+LbFKz5bBEi+Mri9sVH0nGsbCU=";
+    tag = "v${version}";
+    hash = "sha256-JlPikEvRPFhHcTyRJ2ZgmQOrrc6qzhbAO6+NtiN+Wqo=";
   };
 
   patches = [
@@ -23,22 +20,23 @@ buildPythonApplication rec {
     ./fix-path.patch
   ];
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace dnsviz/config.py.in \
+      --replace-fail '@out@' $out
+  '';
+
+  dependencies = with python3Packages; [
     dnspython
     m2crypto
     pygraphviz
   ];
 
-  postPatch = ''
-    substituteInPlace dnsviz/config.py.in --replace '@out@' $out
-  '';
-
   # Tests require network connection and /etc/resolv.conf
   doCheck = false;
 
   pythonImportsCheck = [ "dnsviz" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior";
     mainProgram = "dnsviz";
     longDescription = ''
@@ -47,7 +45,7 @@ buildPythonApplication rec {
 
       This tool suite powers the Web-based analysis available at https://dnsviz.net/
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ jojosch ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ jojosch ];
   };
 }
diff --git a/pkgs/tools/networking/dnsviz/fix-path.patch b/pkgs/tools/networking/dnsviz/fix-path.patch
index 7906058cd98e..4dc963dec71f 100644
--- a/pkgs/tools/networking/dnsviz/fix-path.patch
+++ b/pkgs/tools/networking/dnsviz/fix-path.patch
@@ -2,10 +2,10 @@ diff --git a/dnsviz/config.py.in b/dnsviz/config.py.in
 index 373fde2..007f0f1 100644
 --- a/dnsviz/config.py.in
 +++ b/dnsviz/config.py.in
-@@ -26,12 +26,7 @@ from __future__ import unicode_literals
+@@ -26,12 +26,7 @@
  import os
  import sys
- 
+
 -_prefix = '__DNSVIZ_INSTALL_PREFIX__'
 -if (hasattr(sys, 'real_prefix') or hasattr(sys, 'base_prefix')) and \
 -        not _prefix:
@@ -13,6 +13,6 @@ index 373fde2..007f0f1 100644
 -else:
 -    DNSVIZ_INSTALL_PREFIX = _prefix
 +DNSVIZ_INSTALL_PREFIX = "@out@"
- DNSVIZ_SHARE_PATH = os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz')
+ DNSVIZ_SHARE_PATH = os.getenv('DNSVIZ_SHARE_PATH', os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz'))
  JQUERY_PATH = __JQUERY_PATH__
  JQUERY_UI_PATH = __JQUERY_UI_PATH__
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cc78d7b1dfe..30a5b7482906 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3171,7 +3171,7 @@ with pkgs;
 
   deluge-2_x = deluge;
 
-  dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
+  dnsviz = callPackage ../tools/networking/dnsviz { };
 
   diffoscopeMinimal = diffoscope.override {
     enableBloat = false;

From 3953f9442c350777ad8cc3e25f92217f2fc05f5b Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Mon, 28 Apr 2025 08:45:38 +0000
Subject: [PATCH 2/2] dnsviz: move to pkgs/by-name

---
 pkgs/{tools/networking => by-name/dn}/dnsviz/fix-path.patch     | 0
 .../dnsviz/default.nix => by-name/dn/dnsviz/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{tools/networking => by-name/dn}/dnsviz/fix-path.patch (100%)
 rename pkgs/{tools/networking/dnsviz/default.nix => by-name/dn/dnsviz/package.nix} (100%)

diff --git a/pkgs/tools/networking/dnsviz/fix-path.patch b/pkgs/by-name/dn/dnsviz/fix-path.patch
similarity index 100%
rename from pkgs/tools/networking/dnsviz/fix-path.patch
rename to pkgs/by-name/dn/dnsviz/fix-path.patch
diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/by-name/dn/dnsviz/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsviz/default.nix
rename to pkgs/by-name/dn/dnsviz/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30a5b7482906..bc90b5e4c221 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3171,8 +3171,6 @@ with pkgs;
 
   deluge-2_x = deluge;
 
-  dnsviz = callPackage ../tools/networking/dnsviz { };
-
   diffoscopeMinimal = diffoscope.override {
     enableBloat = false;
   };