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

Merge pull request #117734 from rmcgibbo/certbot

Browse Source
This commit is contained in:
Sandro 2021-04-03 04:18:10 +02:00 committed by GitHub
commit 0d7c02365b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@
, requests-toolbelt , requests-toolbelt
, six , six
, werkzeug , werkzeug
, mock
, ndg-httpsclient , ndg-httpsclient
}: }:
@ -21,7 +20,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six
werkzeug mock ndg-httpsclient josepy werkzeug ndg-httpsclient josepy
]; ];
# does not contain any tests # does not contain any tests

17
pkgs/development/python-modules/certbot/default.nix
View File

@ -3,19 +3,19 @@
, python, runCommand , python, runCommand
, fetchFromGitHub , fetchFromGitHub
, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
, dialog, mock, gnureadline , dialog, gnureadline
, pytest_xdist, pytest, pytestCheckHook, dateutil , pytest_xdist, pytestCheckHook, dateutil
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "certbot"; pname = "certbot";
version = "1.12.0"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM="; sha256 = "1cwhhybj2fjalhhyd184ndn3bid3qib1yy5a93m146cqqgwpw4j6";
}; };
sourceRoot = "source/${pname}"; sourceRoot = "source/${pname}";
@ -37,16 +37,19 @@ buildPythonPackage rec {
zope_interface zope_interface
]; ];
buildInputs = [ dialog mock gnureadline ]; buildInputs = [ dialog gnureadline ];
checkInputs = [ checkInputs = [
dateutil dateutil
pytest
pytestCheckHook pytestCheckHook
pytest_xdist pytest_xdist
]; ];
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; pytestFlagsArray = [
"-o cache_dir=$(mktemp -d)"
# See https://github.com/certbot/certbot/issues/8746
"-W ignore::ResourceWarning"
];
doCheck = true; doCheck = true;

2
pkgs/tools/admin/simp_le/default.nix
View File

@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];
checkInputs = with python3Packages; [ mock ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/zenhack/simp_le"; homepage = "https://github.com/zenhack/simp_le";
description = "Simple Let's Encrypt client"; description = "Simple Let's Encrypt client";