From 4be1d9a44490953790ab6ef93691bdf76037e04a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Dec 2018 12:22:58 -0600
Subject: [PATCH 1/4] certbot, acme: 0.24.0 -> 0.29.1

(same source)
---
 pkgs/tools/admin/certbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 353abe9c8bc..fbf8d5c4857 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.24.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444";
+    sha256 = "13gnqkvmh6mmlqsf18pw0wv6rp8fy0nbqhpw0sv3shkv7iqsmh2k";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From ea9853d790644f8bdf432dceb1f5cd2f58b62989 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Dec 2018 20:41:13 -0600
Subject: [PATCH 2/4] acme: add new deps on requests-toolbelt, pytest; fix

---
 pkgs/development/python-modules/acme/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index 503c6f79659..b65f60745f2 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,6 +1,7 @@
 { buildPythonPackage
 , certbot
 , nose
+, pytest
 , cryptography
 , pyasn1
 , pyopenssl
@@ -8,6 +9,7 @@
 , josepy
 , pytz
 , requests
+, requests-toolbelt
 , six
 , werkzeug
 , mock
@@ -20,11 +22,11 @@ buildPythonPackage rec {
   pname = "acme";
 
   propagatedBuildInputs = [
-    cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
-    ndg-httpsclient josepy
+    cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six
+    werkzeug mock ndg-httpsclient josepy
   ];
 
-  checkInputs = [ nose ];
+  checkInputs = [ nose pytest ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/acme";
 

From 44c84d10f39114dc0c22ac2a0db8fc810660f806 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 31 Dec 2018 11:19:48 -0600
Subject: [PATCH 3/4] acme: remove unneeded 'nose' dep, use 'sourceRoot'
 instead of postUnpack

Specifying "source" in sourceRoot isn't ideal
(hopefully it doesn't change, again?)
but I think this is the preferred way to do this.
---
 pkgs/development/python-modules/acme/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index b65f60745f2..e9156b5c6af 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,6 +1,5 @@
 { buildPythonPackage
 , certbot
-, nose
 , pytest
 , cryptography
 , pyasn1
@@ -26,9 +25,9 @@ buildPythonPackage rec {
     werkzeug mock ndg-httpsclient josepy
   ];
 
-  checkInputs = [ nose pytest ];
+  checkInputs = [ pytest ];
 
-  postUnpack = "sourceRoot=\${sourceRoot}/acme";
+  sourceRoot = "source/${pname}";
 
   meta = certbot.meta // {
     description = "ACME protocol implementation in Python";

From e79e038b095b047ffcb1808080114ac6182d2788 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 3 Feb 2019 21:11:03 -0600
Subject: [PATCH 4/4] acme, certbot: 0.29.1 -> 0.30.2

* move to python3
* touchup deps
---
 pkgs/tools/admin/certbot/default.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index fbf8d5c4857..a75d86c93e7 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -1,34 +1,32 @@
-{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
+{ stdenv, python3Packages, fetchFromGitHub, dialog }:
 
-# Latest version of certbot supports python3 and python3 version of pythondialog
-
-pythonPackages.buildPythonApplication rec {
-  name = "certbot-${version}";
-  version = "0.29.1";
+python3Packages.buildPythonApplication rec {
+  pname = "certbot";
+  version = "0.30.2";
 
   src = fetchFromGitHub {
-    owner = "certbot";
-    repo = "certbot";
+    owner = pname;
+    repo = pname;
     rev = "v${version}";
-    sha256 = "13gnqkvmh6mmlqsf18pw0wv6rp8fy0nbqhpw0sv3shkv7iqsmh2k";
+    sha256 = "0lycmxc6y7mk18irv8qdasw6hsqiiw5p34950h2f5s3vjc09wnw3";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     ConfigArgParse
     acme
     configobj
     cryptography
+    josepy
     parsedatetime
     psutil
     pyRFC3339
     pyopenssl
-    python2-pythondialog
     pytz
     six
     zope_component
     zope_interface
   ];
-  buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
+  buildInputs = [ dialog ] ++ (with python3Packages; [ mock gnureadline ]);
 
   patchPhase = ''
     substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"