Merge pull request #123251 from fabaff/bump-aiodns

python3Packages.aiodns: 2.0.0 -> 3.0.0

pkgs/applications/networking/instant-messengers/poezio/default.nix

@@ -1,15 +1,26 @@
-{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder
-, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkg-config, setuptools }:
+{ lib
+, aiodns
+, buildPythonApplication
+, cffi
+, fetchFromGitHub
+, mpd2
+, pkg-config
+, potr
+, pyasn1
+, pyasn1-modules
+, pyinotify
+, pytestCheckHook
+, pythonOlder
+, setuptools
+, slixmpp
+, typing-extensions
+}:
+
 buildPythonApplication rec {
   pname = "poezio";
   version = "0.13.1";
-
   disabled = pythonOlder "3.4";
 
-    checkInputs = [ pytest ];
-    propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ];
-    nativeBuildInputs = [ pkg-config ];
-
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
@@ -17,14 +28,32 @@ buildPythonApplication rec {
     sha256 = "041y61pcbdb86s04qwp8s1g6bp84yskc7vdizwpi2hz18y01x5fy";
   };
 
-    checkPhase = ''
-      pytest
-    '';
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  propagatedBuildInputs = [
+    aiodns
+    cffi
+    mpd2
+    potr
+    pyasn1
+    pyasn1-modules
+    pyinotify
+    setuptools
+    slixmpp
+  ] ++ lib.optionals (pythonOlder "3.7") [
+    typing-extensions
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Free console XMPP client";
     homepage = "https://poez.io";
-      license = licenses.mit;
+    license = licenses.zlib;
     maintainers = [ maintainers.lsix ];
   };
-  }
+}

pkgs/development/python-modules/aiodns/default.nix

@@ -1,30 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
-, python, pycares, typing ? null
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pycares
+, pythonOlder
+, typing
 }:
 
 buildPythonPackage rec {
   pname = "aiodns";
-  version = "2.0.0";
-  disabled = pythonOlder "3.5";
+  version = "3.0.0";
+  disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d";
+  src = fetchFromGitHub {
+    owner = "saghul";
+    repo = pname;
+    rev = "aiodns-${version}";
+    sha256 = "1i91a43gsq222r8212jn4m6bxc3fl04z1mf2h7s39nqywxkggvlp";
   };
 
-  propagatedBuildInputs = [ pycares ]
-    ++ lib.optional (pythonOlder "3.7") typing;
+  propagatedBuildInputs = [
+    pycares
+  ] ++ lib.optional (pythonOlder "3.7") [
+    typing
+  ];
 
-  checkPhase = ''
-    ${python.interpreter} tests.py
-  '';
-
-  # 'Could not contact DNS servers'
+  # Could not contact DNS servers
   doCheck = false;
 
+  pythonImportsCheck = [ "aiodns" ];
+
   meta = with lib; {
+    description = "Simple DNS resolver for asyncio";
     homepage = "https://github.com/saghul/aiodns";
     license = licenses.mit;
-    description = "Simple DNS resolver for asyncio";
+    maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/pycares/default.nix

@@ -1,35 +1,38 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, python
 , c-ares
 , cffi
+, fetchPypi
+, idna
 }:
 
 buildPythonPackage rec {
   pname = "pycares";
-  version = "3.1.1";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18dfd4fd300f570d6c4536c1d987b7b7673b2a9d14346592c5d6ed716df0d104";
+    sha256 = "sha256-0BVPxXU7CIdY++ybwTfhsku4T8DGoJclyLrCWjQjEc0=";
   };
 
-  buildInputs = [ c-ares ];
+  buildInputs = [
+    c-ares
+  ];
 
-  propagatedBuildInputs = [ cffi ];
+  propagatedBuildInputs = [
+    cffi
+    idna
+  ];
 
-  checkPhase = ''
-    ${python.interpreter} tests/tests.py
-  '';
-
-  # requires network access
+  # Requires network access
   doCheck = false;
 
-  meta = with lib; {
-    homepage = "https://github.com/saghul/pycares";
-    description = "Interface for c-ares";
-    license = licenses.mit;
-  };
+  pythonImportsCheck = [ "pycares" ];
 
+  meta = with lib; {
+    description = "Python interface for c-ares";
+    homepage = "https://github.com/saghul/pycares";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
 }