Merge pull request #51690 from dtzWill/update/acme-0.29.1

certbot, acme: 0.24.0 -> 0.30.2
This commit is contained in:
Will Dietz 2019-02-11 17:38:35 -06:00 committed by GitHub
commit 4d8e3a2e61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 17 deletions

View File

@ -1,6 +1,6 @@
{ buildPythonPackage
, certbot
, nose
, pytest
, cryptography
, pyasn1
, pyopenssl
@ -8,6 +8,7 @@
, josepy
, pytz
, requests
, requests-toolbelt
, six
, werkzeug
, mock
@ -20,13 +21,13 @@ 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 = [ pytest ];
postUnpack = "sourceRoot=\${sourceRoot}/acme";
sourceRoot = "source/${pname}";
meta = certbot.meta // {
description = "ACME protocol implementation in Python";

View File

@ -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.24.0";
python3Packages.buildPythonApplication rec {
pname = "certbot";
version = "0.30.2";
src = fetchFromGitHub {
owner = "certbot";
repo = "certbot";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444";
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"