certbot: 0.19.0 -> 0.22.2

This commit is contained in:
makefu 2018-03-20 22:25:50 +01:00
parent 7a0027804c
commit e9f176a09a
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 22 additions and 10 deletions

View File

@ -1,6 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339 , certbot
, pytz, requests, six, werkzeug, mock, ndg-httpsclient }: , nose
, cryptography
, pyasn1
, pyopenssl
, pyRFC3339
, josepy
, pytz
, requests
, six
, werkzeug
, mock
, ndg-httpsclient
}:
buildPythonPackage rec { buildPythonPackage rec {
inherit (certbot) src version; inherit (certbot) src version;
@ -10,10 +22,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
ndg-httpsclient ndg-httpsclient josepy
]; ];
buildInputs = [ nose ]; checkInputs = [ nose ];
postUnpack = "sourceRoot=\${sourceRoot}/acme"; postUnpack = "sourceRoot=\${sourceRoot}/acme";
} }

View File

@ -1,19 +1,19 @@
{ stdenv, python2Packages, fetchFromGitHub, dialog }: { stdenv, pythonPackages, fetchFromGitHub, dialog }:
# Latest version of certbot supports python3 and python3 version of pythondialog # Latest version of certbot supports python3 and python3 version of pythondialog
python2Packages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "certbot-${version}"; name = "certbot-${version}";
version = "0.19.0"; version = "0.22.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "certbot"; owner = "certbot";
repo = "certbot"; repo = "certbot";
rev = "v${version}"; rev = "v${version}";
sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7"; sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg";
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with pythonPackages; [
ConfigArgParse ConfigArgParse
acme acme
configobj configobj
@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec {
zope_component zope_component
zope_interface zope_interface
]; ];
buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
patchPhase = '' patchPhase = ''
substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"