about summary refs log tree commit diff
path: root/pkgs/servers/dns
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-18 12:53:44 +0200
commitf65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch)
tree98bb48130a5c464418af19f314236e112ad20c55 /pkgs/servers/dns
parentb8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff)
parentffbb4d26f9f93681576815be82142d14f2aa8234 (diff)
downloadnixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.gz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.bz2
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.lz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.xz
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.tar.zst
nixlib-f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/dns')
-rw-r--r--pkgs/servers/dns/doh-proxy/default.nix30
1 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix
index ac44dbbf04d1..d94f34ebd21f 100644
--- a/pkgs/servers/dns/doh-proxy/default.nix
+++ b/pkgs/servers/dns/doh-proxy/default.nix
@@ -1,17 +1,35 @@
 { lib, python3Packages }:
 
-python3Packages.buildPythonApplication rec {
+with python3Packages;
+buildPythonApplication rec {
   pname = "doh-proxy";
-  version = "0.0.8";
+  version = "0.0.9";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c";
+    sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp";
   };
 
-  propagatedBuildInputs = with python3Packages;
-    [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ];
-  doCheck = false; # Trouble packaging unittest-data-provider
+  nativeBuildInputs = [ pytestrunner flake8];
+
+  propagatedBuildInputs = [
+    aioh2
+    dnspython
+    aiohttp-remotes
+  ];
+
+  checkInputs = [
+    asynctest
+    unittest-data-provider
+    pytest
+    pytestcov
+    pytest-aiohttp
+  ];
+
+  # attempts to resolve address
+  checkPhase = ''
+    pytest -k 'not servers'
+  '';
 
   meta = with lib; {
     homepage = https://facebookexperimental.github.io/doh-proxy/;