Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 22 insertions, 18 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/irc/default.nix b/nixpkgs/pkgs/development/python-modules/irc/default.nix
index e252987e3fb0..a068d26695e5 100644
--- a/nixpkgs/pkgs/development/python-modules/irc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/irc/default.nix
@@ -1,51 +1,55 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
-, six
+, jaraco-collections
+, jaraco-itertools
 , jaraco-logging
-, jaraco-text
 , jaraco-stream
+, jaraco-text
+, pytestCheckHook
+, pythonOlder
 , pytz
-, jaraco-itertools
 , setuptools-scm
-, jaraco-collections
-, importlib-metadata
 }:
 
 buildPythonPackage rec {
   pname = "irc";
-  version = "20.1.0";
+  version = "20.3.0";
   format = "pyproject";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w=";
+    hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
   propagatedBuildInputs = [
-    six
-    importlib-metadata
+    jaraco-collections
+    jaraco-itertools
     jaraco-logging
-    jaraco-text
     jaraco-stream
+    jaraco-text
     pytz
-    jaraco-itertools
-    jaraco-collections
   ];
 
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "irc" ];
+  pythonImportsCheck = [
+    "irc"
+  ];
 
   meta = with lib; {
     description = "IRC (Internet Relay Chat) protocol library for Python";
     homepage = "https://github.com/jaraco/irc";
+    changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [];
+    maintainers = with maintainers; [ ];
   };
 }