diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:24:03 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:24:03 +0100 |
commit | a69e30979460bec85a44a04690bfc7abcb1964ce (patch) | |
tree | b0ed96260b67524e547a9c338bbfd72b34683e64 /pkgs/tools/admin | |
parent | 5aed91512da5e972289fbd0ecd3cf74efa7d81fe (diff) | |
parent | 480fc1856a41800cde7f0b154f9bb0c3f8c4e27a (diff) | |
download | nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.gz nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.bz2 nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.lz nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.xz nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.zst nixpkgs-a69e30979460bec85a44a04690bfc7abcb1964ce.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/admin')
4 files changed, 17 insertions, 51 deletions
diff --git a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch index 81c1dd0e6a3..62351a70160 100644 --- a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch +++ b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch @@ -1,6 +1,6 @@ -From 411b8a413baf39e9b967949b17a992e81a11abfe Mon Sep 17 00:00:00 2001 +From 0de195de31dc311976af52a7c2b547bc23af2691 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> -Date: Tue, 29 Oct 2019 14:08:07 +0100 +Date: Sat, 14 Dec 2019 19:27:14 +0100 Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain versions @@ -18,13 +18,13 @@ line 137, in parse ValueError: invalid version number '41.4.0.post20191022' ``` --- - setup.py | 15 +-------------- + certbot/setup.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -diff --git a/setup.py b/setup.py -index 1f4838c90..831528d77 100644 ---- a/setup.py -+++ b/setup.py +diff --git a/certbot/setup.py b/certbot/setup.py +index c1bf914..7456bf2 100644 +--- a/certbot/setup.py ++++ b/certbot/setup.py @@ -3,7 +3,6 @@ import os import re import sys @@ -40,7 +40,7 @@ index 1f4838c90..831528d77 100644 -# However environment markers are supported only with setuptools >= 36.2. -# So this dependency is not added for old Linux distributions with old setuptools, -# in order to allow these systems to build certbot from sources. - pywin32_req = 'pywin32>=224' + pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py -if StrictVersion(setuptools_version) >= StrictVersion('36.2'): - install_requires.append(pywin32_req + " ; sys_platform == 'win32'") -elif 'bdist_wheel' in sys.argv[1:]: @@ -56,5 +56,5 @@ index 1f4838c90..831528d77 100644 dev_extras = [ 'astroid==1.6.5', -- -2.23.0 +2.24.1 diff --git a/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch b/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch deleted file mode 100644 index 33f0cd216c1..00000000000 --- a/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8ddf2697508eca514a0dde4646ad14ac3ba34b2a Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Fri, 18 Oct 2019 16:06:50 +0200 -Subject: [PATCH] pebble_artifacts: hardcode pebble location - ---- - certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -index 2b1557928..d2603c51a 100644 ---- a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -+++ b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -@@ -22,6 +22,7 @@ def fetch(workspace): - - - def _fetch_asset(asset, suffix): -+ return "@pebble@" - asset_path = os.path.join(ASSETS_PATH, '{0}_{1}_{2}'.format(asset, PEBBLE_VERSION, suffix)) - if not os.path.exists(asset_path): - asset_url = ('https://github.com/letsencrypt/pebble/releases/download/{0}/{1}_{2}' --- -2.23.0 - diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 7d3d019e81f..8fdbfd12778 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,19 +1,18 @@ -{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook, nginx, pebble }: +{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: python37Packages.buildPythonApplication rec { pname = "certbot"; - version = "0.39.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1s32xg2ljz7ci78wc8rqkjvgrz7vprb7fkznrlf9a4blm55pp54c"; + sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; }; patches = [ - ./0001-pebble_artifacts-hardcode-pebble-location.patch ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; @@ -43,9 +42,8 @@ python37Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" - substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" - substituteInPlace certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py --replace "@pebble@" "${pebble}/bin/pebble" + cd certbot + substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" ''; postInstall = '' @@ -55,15 +53,7 @@ python37Packages.buildPythonApplication rec { done ''; - # tests currently time out, because they're trying to do network access - # Upstream issue: https://github.com/certbot/certbot/issues/7450 - doCheck = false; - - checkPhase = '' - PATH="$out/bin:${nginx}/bin:$PATH" pytest certbot-ci/certbot_integration_tests - ''; - - dontUseSetuptoolsCheck = true; + doCheck = true; meta = with stdenv.lib; { homepage = src.meta.homepage; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 37f627a18f5..eaefba36545 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.16.0"; + version = "0.17.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "17azqlb1xsnh9p0m75apb19j7pramgj00cf5k6fwzz2zqz0x0hpp"; + sha256 = "0m1jynar4calaffp2zdxr5yy9vnhw2qf2hsfxwzfwf8fqb5h7bjb"; }; postPatch = '' |