From 9017c2b775dfbd894d1a248511749b5ad06a2ac0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Oct 2022 11:03:24 +0200
Subject: [PATCH 1/2] certbot: nixpkgs-fmt

---
 .../python-modules/certbot/default.nix        | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 8bef6cf2148e..498dcf23b11a 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -1,10 +1,27 @@
 { lib
 , buildPythonPackage
-, python, runCommand
+, python
+, runCommand
 , fetchFromGitHub
-, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
-, dialog, gnureadline
-, pytest-xdist, pytestCheckHook, python-dateutil
+, configargparse
+, acme
+, configobj
+, cryptography
+, distro
+, josepy
+, parsedatetime
+, pyRFC3339
+, pyopenssl
+, pytz
+, requests
+, six
+, zope_component
+, zope_interface
+, dialog
+, gnureadline
+, pytest-xdist
+, pytestCheckHook
+, python-dateutil
 }:
 
 buildPythonPackage rec {
@@ -59,15 +76,17 @@ buildPythonPackage rec {
   # certbot.withPlugins has a similar calling convention as python*.withPackages
   # it gets invoked with a lambda, and invokes that lambda with the python package set matching certbot's:
   # certbot.withPlugins (cp: [ cp.certbot-dns-foo ])
-  passthru.withPlugins = f: let
-    pythonEnv = python.withPackages f;
+  passthru.withPlugins = f:
+    let
+      pythonEnv = python.withPackages f;
 
-  in runCommand "certbot-with-plugins" {
-  } ''
-    mkdir -p $out/bin
-    cd $out/bin
-    ln -s ${pythonEnv}/bin/certbot
-  '';
+    in
+    runCommand "certbot-with-plugins"
+      { } ''
+      mkdir -p $out/bin
+      cd $out/bin
+      ln -s ${pythonEnv}/bin/certbot
+    '';
 
   meta = with lib; {
     homepage = src.meta.homepage;

From a85578e40171d68231a6312a8b23249cc314ce54 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 12 Oct 2022 11:05:00 +0200
Subject: [PATCH 2/2] certbot: 1.29.0 -> 1.31.0

Fixes `(pkgs.certbot.withPlugins (p: [ p.certbot-dns-route53 ]))` and
`certbot-full` build.
---
 pkgs/development/python-modules/certbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 498dcf23b11a..c2f3c1f7915f 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -26,13 +26,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.29.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-DFdXDFSqqkm4r59Kmd1wxcg2YePP3dI9squiW+iSmaU=";
+    sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg=";
   };
 
   sourceRoot = "source/${pname}";