git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #81196 from prusnak/certbot

certbot: 1.0.0 -> 1.3.0

commitb6dbef4759947451dd1ab3d6d64c16d4d5ab5810 authorMarek Mahut <marek.mahut@gmail.com> dateSat 4 Apr 2020, 08:18 (7 years ago) parent788e07cd07543a
3 files changed+26−28
pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch+7−9 pkgs/tools/admin/certbot/default.nix+18−18 pkgs/top-level/all-packages.nix+1−1
pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch+7−9
@@ -22,18 +22,16 @@ ValueError: invalid version number '41.4.0.post20191022'
2222 1 file changed, 1 insertion(+), 14 deletions(-)
2323
2424diff --git a/certbot/setup.py b/certbot/setup.py
25−index c1bf914..7456bf2 100644
25+index d19327e5e..ac1524793 100644
2626--- a/certbot/setup.py
2727+++ b/certbot/setup.py
28−@@ -3,7 +3,6 @@ import os
28+@@ -1,5 +1,4 @@
29+ import codecs
30+-from distutils.version import StrictVersion
31+ import os
2932 import re
3033 import sys
31−
32−-from distutils.version import StrictVersion
33− from setuptools import find_packages, setup, __version__ as setuptools_version
34− from setuptools.command.test import test as TestCommand
35−
36−@@ -56,20 +55,8 @@ install_requires = [
34+@@ -58,20 +57,8 @@ install_requires = [
3735
3836 # Add pywin32 on Windows platforms to handle low-level system calls.
3937 # This dependency needs to be added using environment markers to avoid its installation on Linux.
@@ -54,7 +52,7 @@ index c1bf914..7456bf2 100644
5452+install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
5553
5654 dev_extras = [
57− 'astroid==1.6.5',
55+ 'coverage',
5856--
59572.24.1
6058
pkgs/tools/admin/certbot/default.nix+18−18
@@ -1,22 +1,27 @@
1−{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }:
1+{ lib
2+, buildPythonApplication
3+, fetchFromGitHub
4+, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
5+, dialog, mock, gnureadline
6+, pytest_xdist, pytest, dateutil
7+}:
28
3−
4−python37Packages.buildPythonApplication rec {
9+buildPythonApplication rec {
510 pname = "certbot";
6− version = "1.0.0";
11+ version = "1.3.0";
712
813 src = fetchFromGitHub {
914 owner = pname;
1015 repo = pname;
1116 rev = "v${version}";
12− sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465";
17+ sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa";
1318 };
1419
1520 patches = [
1621 ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
1722 ];
1823
19− propagatedBuildInputs = with python37Packages; [
24+ propagatedBuildInputs = [
2025 ConfigArgParse
2126 acme
2227 configobj
@@ -24,26 +29,21 @@ python37Packages.buildPythonApplication rec {
2429 distro
2530 josepy
2631 parsedatetime
27− psutil
2832 pyRFC3339
2933 pyopenssl
3034 pytz
35+ requests
3136 six
3237 zope_component
3338 zope_interface
3439 ];
3540
36− buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]);
41+ buildInputs = [ dialog mock gnureadline ];
3742
38− checkInputs = with python37Packages; [
39− pytest_xdist
40− pytest
41− dateutil
42− ];
43+ checkInputs = [ pytest_xdist pytest dateutil ];
4344
44− postPatch = ''
45+ preBuild = ''
4546 cd certbot
46− substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"
4747 '';
4848
4949 postInstall = ''
@@ -55,11 +55,11 @@ python37Packages.buildPythonApplication rec {
5555
5656 doCheck = true;
5757
58− meta = with stdenv.lib; {
58+ meta = with lib; {
5959 homepage = src.meta.homepage;
6060 description = "ACME client that can obtain certs and extensibly update server configurations";
6161 platforms = platforms.unix;
62− maintainers = [ maintainers.domenkozar ];
63− license = licenses.asl20;
62+ maintainers = with maintainers; [ domenkozar ];
63+ license = with licenses; [ asl20 ];
6464 };
6565}
pkgs/top-level/all-packages.nix+1−1
@@ -11236,7 +11236,7 @@ in
1123611236 ogre = ogre1_10;
1123711237 };
1123811238
11239− certbot = callPackage ../tools/admin/certbot { };
11239+ certbot = python3Packages.callPackage ../tools/admin/certbot { };
1124011240
1124111241 caf = callPackage ../development/libraries/caf {};
1124211242