public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/acme/default.nix
View File

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

22
pkgs/tools/admin/certbot/default.nix
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 python3Packages.buildPythonApplication rec {
pname = "certbot";
pythonPackages.buildPythonApplication rec { version = "0.30.2";
name = "certbot-${version}";
version = "0.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "certbot"; owner = pname;
repo = "certbot"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444"; sha256 = "0lycmxc6y7mk18irv8qdasw6hsqiiw5p34950h2f5s3vjc09wnw3";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python3Packages; [
ConfigArgParse ConfigArgParse
acme acme
configobj configobj
cryptography cryptography
josepy
parsedatetime parsedatetime
psutil psutil
pyRFC3339 pyRFC3339
pyopenssl pyopenssl
python2-pythondialog
pytz pytz
six six
zope_component zope_component
zope_interface zope_interface
]; ];
buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); buildInputs = [ dialog ] ++ (with python3Packages; [ 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"