git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92696 from flokli/certbot-1.6.0

certbot: 1.3.0 -> 1.6.0

commit074d1319799c95425da64c9b23725e782be6ccf5 authorFélix Baylac-Jacqué <NinjaTrappeur@users.noreply.github.com> dateThu 9 Jul 2020, 11:55 (6 years ago) parent6ce0442ee9123d
6 files changed+113−64
pkgs/development/python-modules/certbot-dns-cloudflare/default.nix+35 pkgs/development/python-modules/certbot-dns-rfc2136/default.nix+35 pkgs/development/python-modules/certbot-dns-route53/default.nix+35 pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch−58 pkgs/tools/admin/certbot/default.nix+2−6 pkgs/top-level/python-packages.nix+6
pkgs/development/python-modules/certbot-dns-cloudflare/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ buildPythonPackage
2+, acme
3+, certbot
4+, cloudflare
5+, isPy3k
6+, pytest
7+, pytestCheckHook
8+}:
9+
10+buildPythonPackage rec {
11+ inherit (certbot) src version;
12+
13+ pname = "certbot-dns-cloudflare";
14+
15+ propagatedBuildInputs = [
16+ acme
17+ certbot
18+ cloudflare
19+ ];
20+
21+ checkInputs = [
22+ pytest
23+ pytestCheckHook
24+ ];
25+
26+ disabled = !isPy3k;
27+
28+ pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
29+
30+ sourceRoot = "source/${pname}";
31+
32+ meta = certbot.meta // {
33+ description = "Cloudflare DNS Authenticator plugin for Certbot";
34+ };
35+}
pkgs/development/python-modules/certbot-dns-rfc2136/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ buildPythonPackage
2+, acme
3+, certbot
4+, dnspython
5+, isPy3k
6+, pytest
7+, pytestCheckHook
8+}:
9+
10+buildPythonPackage rec {
11+ inherit (certbot) src version;
12+
13+ pname = "certbot-dns-rfc2136";
14+
15+ propagatedBuildInputs = [
16+ acme
17+ certbot
18+ dnspython
19+ ];
20+
21+ checkInputs = [
22+ pytest
23+ pytestCheckHook
24+ ];
25+
26+ disabled = !isPy3k;
27+
28+ pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
29+
30+ sourceRoot = "source/${pname}";
31+
32+ meta = certbot.meta // {
33+ description = "RFC 2136 DNS Authenticator plugin for Certbot";
34+ };
35+}
pkgs/development/python-modules/certbot-dns-route53/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ buildPythonPackage
2+, acme
3+, boto3
4+, certbot
5+, isPy3k
6+, pytest
7+, pytestCheckHook
8+}:
9+
10+buildPythonPackage rec {
11+ inherit (certbot) src version;
12+
13+ pname = "certbot-dns-route53";
14+
15+ propagatedBuildInputs = [
16+ acme
17+ boto3
18+ certbot
19+ ];
20+
21+ checkInputs = [
22+ pytest
23+ pytestCheckHook
24+ ];
25+
26+ disabled = !isPy3k;
27+
28+ pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
29+
30+ sourceRoot = "source/${pname}";
31+
32+ meta = certbot.meta // {
33+ description = "Route53 DNS Authenticator plugin for Certbot";
34+ };
35+}
pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patchdeleted−58
@@ -1,58 +0,0 @@
1−From 0de195de31dc311976af52a7c2b547bc23af2691 Mon Sep 17 00:00:00 2001
2−From: Frederik Rietdijk <fridh@fridh.nl>
3−Date: Sat, 14 Dec 2019 19:27:14 +0100
4−Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain
5− versions
6−
7−```
8− File "setup.py", line 63, in <module>
9− if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
10−File
11−"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
12−line 40, in __init__
13− self.parse(vstring)
14−File
15−"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
16−line 137, in parse
17− raise ValueError("invalid version number '%s'" % vstring)
18−ValueError: invalid version number '41.4.0.post20191022'
19−```
20−---
21− certbot/setup.py | 15 +--------------
22− 1 file changed, 1 insertion(+), 14 deletions(-)
23−
24−diff --git a/certbot/setup.py b/certbot/setup.py
25−index d19327e5e..ac1524793 100644
26−--- a/certbot/setup.py
27−+++ b/certbot/setup.py
28−@@ -1,5 +1,4 @@
29− import codecs
30−-from distutils.version import StrictVersion
31− import os
32− import re
33− import sys
34−@@ -58,20 +57,8 @@ install_requires = [
35−
36− # Add pywin32 on Windows platforms to handle low-level system calls.
37− # This dependency needs to be added using environment markers to avoid its installation on Linux.
38−-# However environment markers are supported only with setuptools >= 36.2.
39−-# So this dependency is not added for old Linux distributions with old setuptools,
40−-# in order to allow these systems to build certbot from sources.
41− pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py
42−-if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
43−- install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
44−-elif 'bdist_wheel' in sys.argv[1:]:
45−- raise RuntimeError('Error, you are trying to build certbot wheels using an old version '
46−- 'of setuptools. Version 36.2+ of setuptools is required.')
47−-elif os.name == 'nt':
48−- # This branch exists to improve this package's behavior on Windows. Without
49−- # it, if the sdist is installed on Windows with an old version of
50−- # setuptools, pywin32 will not be specified as a dependency.
51−- install_requires.append(pywin32_req)
52−+install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
53−
54− dev_extras = [
55− 'coverage',
56−--
57−2.24.1
58−
pkgs/tools/admin/certbot/default.nix+2−6
@@ -8,19 +8,15 @@
88
99buildPythonApplication rec {
1010 pname = "certbot";
11− version = "1.3.0";
11+ version = "1.6.0";
1212
1313 src = fetchFromGitHub {
1414 owner = pname;
1515 repo = pname;
1616 rev = "v${version}";
17− sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa";
17+ sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc";
1818 };
1919
20− patches = [
21− ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
22− ];
23−
2420 propagatedBuildInputs = [
2521 ConfigArgParse
2622 acme
pkgs/top-level/python-packages.nix+6
@@ -579,6 +579,12 @@ in {
579579
580580 cdecimal = callPackage ../development/python-modules/cdecimal { };
581581
582+ certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { };
583+
584+ certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { };
585+
586+ certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { };
587+
582588 cfn-flip = callPackage ../development/python-modules/cfn-flip { };
583589
584590 chalice = callPackage ../development/python-modules/chalice { };