From 676bbe428ba77e9815a5e7741af01017a8aec9ff Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <jacobi.petrucciani@medable.com>
Date: Fri, 29 Oct 2021 14:59:06 -0400
Subject: [PATCH] python3Packages.certbot-dns-*: lint

---
 .../certbot-dns-cloudflare/default.nix              | 13 +++++--------
 .../python-modules/certbot-dns-rfc2136/default.nix  | 12 +++++-------
 .../python-modules/certbot-dns-route53/default.nix  | 12 +++++-------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
index 6c14f6c472f7..abdd6d2d8f06 100644
--- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
@@ -2,16 +2,16 @@
 , acme
 , certbot
 , cloudflare
-, isPy3k
-, pytest
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
-  inherit (certbot) src version;
-
   pname = "certbot-dns-cloudflare";
 
+  inherit (certbot) src version;
+  disabled = pythonOlder "3.6";
+
   propagatedBuildInputs = [
     acme
     certbot
@@ -19,15 +19,12 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
     pytestCheckHook
   ];
 
-  disabled = !isPy3k;
-
   pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
 
-  sourceRoot = "source/${pname}";
+  sourceRoot = "source/certbot-dns-cloudflare";
 
   meta = certbot.meta // {
     description = "Cloudflare DNS Authenticator plugin for Certbot";
diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
index 19e53aa20cc9..c7f47dc7a398 100644
--- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
@@ -3,15 +3,16 @@
 , certbot
 , dnspython
 , isPy3k
-, pytest
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
-  inherit (certbot) src version;
-
   pname = "certbot-dns-rfc2136";
 
+  inherit (certbot) src version;
+  disabled = pythonOlder "3.6";
+
   propagatedBuildInputs = [
     acme
     certbot
@@ -19,15 +20,12 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
     pytestCheckHook
   ];
 
-  disabled = !isPy3k;
-
   pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
 
-  sourceRoot = "source/${pname}";
+  sourceRoot = "source/certbot-dns-rfc2136";
 
   meta = certbot.meta // {
     description = "RFC 2136 DNS Authenticator plugin for Certbot";
diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix
index 6fba51ce92a1..9644e99a10df 100644
--- a/pkgs/development/python-modules/certbot-dns-route53/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix
@@ -3,15 +3,16 @@
 , boto3
 , certbot
 , isPy3k
-, pytest
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
-  inherit (certbot) src version;
-
   pname = "certbot-dns-route53";
 
+  inherit (certbot) src version;
+  disabled = pythonOlder "3.6";
+
   propagatedBuildInputs = [
     acme
     boto3
@@ -19,15 +20,12 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
     pytestCheckHook
   ];
 
-  disabled = !isPy3k;
-
   pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
 
-  sourceRoot = "source/${pname}";
+  sourceRoot = "source/certbot-dns-route53";
 
   meta = certbot.meta // {
     description = "Route53 DNS Authenticator plugin for Certbot";