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

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 24 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix b/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix
index 9de0801d5375..c75dc71e0fc0 100644
--- a/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix
@@ -1,22 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python-dateutil
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "python-crontab";
-  version = "2.6.0";
+  version = "2.7.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b";
+    hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k=";
   };
 
-  checkInputs = [ pytestCheckHook ];
+  propagatedBuildInputs = [
+    python-dateutil
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   disabledTests = [
     "test_07_non_posix_shell"
     # doctest that assumes /tmp is writeable, awkward to patch
     "test_03_usage"
   ];
 
-  propagatedBuildInputs = [ python-dateutil ];
+  pythonImportsCheck = [
+    "crontab"
+  ];
 
   meta = with lib; {
     description = "Python API for crontab";
@@ -24,7 +42,7 @@ buildPythonPackage rec {
       Crontab module for reading and writing crontab files
       and accessing the system cron automatically and simply using a direct API.
     '';
-    homepage = "https://pypi.org/project/python-crontab/";
+    homepage = "https://gitlab.com/doctormo/python-crontab/";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ kfollesdal ];
   };