dnsviz: 0.9.4 -> 0.11.1 (#400601)

pkgs/by-name/dn/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__

pkgs/by-name/dn/dnsviz/package.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 ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -3146,8 +3146,6 @@ with pkgs;
 
   deluge-2_x = deluge;
 
-  dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
-
   diffoscopeMinimal = diffoscope.override {
     enableBloat = false;
   };