diff --git a/pkgs/by-name/ce/certbot/package.nix b/pkgs/by-name/ce/certbot/package.nix index 300ee0005c15..5c1cf5746425 100644 --- a/pkgs/by-name/ce/certbot/package.nix +++ b/pkgs/by-name/ce/certbot/package.nix @@ -7,19 +7,6 @@ let python = python3.override { self = python; packageOverrides = self: super: { - josepy = super.josepy.overridePythonAttrs (old: rec { - version = "1.15.0"; - src = fetchFromGitHub { - owner = "certbot"; - repo = "josepy"; - tag = "v${version}"; - hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc="; - }; - dependencies = with self; [ - pyopenssl - cryptography - ]; - }); }; }; in diff --git a/pkgs/by-name/si/simp_le/package.nix b/pkgs/by-name/si/simp_le/package.nix index a54696a445cb..5a6aa32393ad 100644 --- a/pkgs/by-name/si/simp_le/package.nix +++ b/pkgs/by-name/si/simp_le/package.nix @@ -10,7 +10,15 @@ let python = python3.override { self = python; packageOverrides = self: super: { - # acme doesn't support josepy v2 + certbot = super.certbot.overridePythonAttrs rec { + version = "3.1.0"; + src = fetchFromGitHub { + owner = "certbot"; + repo = "certbot"; + tag = "v${version}"; + hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ="; + }; + }; josepy = super.josepy.overridePythonAttrs (old: rec { version = "1.15.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index fa352f35bd68..1b420e616534 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "certbot"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; tag = "v${version}"; - hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ="; + hash = "sha256-GS4JLLXrX4+BQ4S6ySbOHUaUthCFYTCHWnOaMpfnIj8="; }; postPatch = "cd certbot"; # using sourceRoot would interfere with patches @@ -84,8 +84,6 @@ buildPythonPackage rec { ''; meta = with lib; { - # AttributeError: module 'josepy' has no attribute 'ComparableX509' - broken = lib.versionAtLeast josepy.version "2"; homepage = "https://github.com/certbot/certbot"; changelog = "https://github.com/certbot/certbot/blob/${src.tag}/certbot/CHANGELOG.md"; description = "ACME client that can obtain certs and extensibly update server configurations"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1a25a9bf1007..4b9ea06bce07 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -163,22 +163,6 @@ let }; }); - # acme and thus hass-nabucasa doesn't support josepy v2 - # https://github.com/certbot/certbot/issues/10185 - josepy = super.josepy.overridePythonAttrs (old: rec { - version = "1.15.0"; - src = fetchFromGitHub { - owner = "certbot"; - repo = "josepy"; - tag = "v${version}"; - hash = "sha256-fK4JHDP9eKZf2WO+CqRdEjGwJg/WNLvoxiVrb5xQxRc="; - }; - dependencies = with self; [ - pyopenssl - cryptography - ]; - }); - openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { version = "2.2"; src = fetchFromGitHub {