Merge pull request #115337 from jojosch/dnsviz-init

dnsviz: init at 0.9.2
This commit is contained in:
Sandro 2021-03-07 19:28:07 +01:00 committed by GitHub
commit 6236faeb0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 0 deletions

View file

@ -0,0 +1,51 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, dnspython
, m2crypto
, pygraphviz
}:
buildPythonApplication rec {
pname = "dnsviz";
version = "0.9.2";
src = fetchFromGitHub {
owner = "dnsviz";
repo = "dnsviz";
rev = "v${version}";
sha256 = "sha256-tIxjlNtncZJSdfQelIR9fTohBDkyC0+YwEcs2gNfKec=";
};
patches = [
# override DNSVIZ_INSTALL_PREFIX with $out
./fix-path.patch
];
propagatedBuildInputs = [
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; {
description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior";
longDescription = ''
DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior,
including its security extensions (DNSSEC).
This tool suite powers the Web-based analysis available at https://dnsviz.net/
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jojosch ];
};
}

View file

@ -0,0 +1,18 @@
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
import os
import sys
-_prefix = '__DNSVIZ_INSTALL_PREFIX__'
-if (hasattr(sys, 'real_prefix') or hasattr(sys, 'base_prefix')) and \
- not _prefix:
- DNSVIZ_INSTALL_PREFIX = sys.prefix
-else:
- DNSVIZ_INSTALL_PREFIX = _prefix
+DNSVIZ_INSTALL_PREFIX = "@out@"
DNSVIZ_SHARE_PATH = os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz')
JQUERY_PATH = __JQUERY_PATH__
JQUERY_UI_PATH = __JQUERY_UI_PATH__

View file

@ -3665,6 +3665,8 @@ in
dnstop = callPackage ../tools/networking/dnstop { };
dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
dnsx = callPackage ../tools/security/dnsx { };
dhcp = callPackage ../tools/networking/dhcp { };