git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117734 from rmcgibbo/certbot
commit0d7c02365bae3129606a3357cbe9084332ba66ad authorSandro <sandro.jaeckel@gmail.com> dateSat 3 Apr 2021, 04:18 (6 years ago) parentcd2e10db9c178a
3 files changed+13−9
pkgs/development/python-modules/acme/default.nix+1−2 pkgs/development/python-modules/certbot/default.nix+10−7 pkgs/tools/admin/simp_le/default.nix+2
pkgs/development/python-modules/acme/default.nix+1−2
@@ -10,7 +10,6 @@
1010, requests-toolbelt
1111, six
1212, werkzeug
13−, mock
1413, ndg-httpsclient
1514}:
1615
@@ -21,7 +20,7 @@ buildPythonPackage rec {
2120
2221 propagatedBuildInputs = [
2322 cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six
24− werkzeug mock ndg-httpsclient josepy
23+ werkzeug ndg-httpsclient josepy
2524 ];
2625
2726 # does not contain any tests
pkgs/development/python-modules/certbot/default.nix+10−7
@@ -3,19 +3,19 @@
33, python, runCommand
44, fetchFromGitHub
55, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
6−, dialog, mock, gnureadline
7−, pytest_xdist, pytest, pytestCheckHook, dateutil
6+, dialog, gnureadline
7+, pytest_xdist, pytestCheckHook, dateutil
88}:
99
1010buildPythonPackage rec {
1111 pname = "certbot";
12− version = "1.12.0";
12+ version = "1.13.0";
1313
1414 src = fetchFromGitHub {
1515 owner = pname;
1616 repo = pname;
1717 rev = "v${version}";
18− sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM=";
18+ sha256 = "1cwhhybj2fjalhhyd184ndn3bid3qib1yy5a93m146cqqgwpw4j6";
1919 };
2020
2121 sourceRoot = "source/${pname}";
@@ -37,16 +37,19 @@ buildPythonPackage rec {
3737 zope_interface
3838 ];
3939
40− buildInputs = [ dialog mock gnureadline ];
40+ buildInputs = [ dialog gnureadline ];
4141
4242 checkInputs = [
4343 dateutil
44− pytest
4544 pytestCheckHook
4645 pytest_xdist
4746 ];
4847
49− pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
48+ pytestFlagsArray = [
49+ "-o cache_dir=$(mktemp -d)"
50+ # See https://github.com/certbot/certbot/issues/8746
51+ "-W ignore::ResourceWarning"
52+ ];
5053
5154 doCheck = true;
5255
pkgs/tools/admin/simp_le/default.nix+2
@@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec {
2222
2323 propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];
2424
25+ checkInputs = with python3Packages; [ mock ];
26+
2527 meta = with lib; {
2628 homepage = "https://github.com/zenhack/simp_le";
2729 description = "Simple Let's Encrypt client";