diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix index f620568e1fa1..565655c5678c 100644 --- a/pkgs/development/python-modules/service-identity/default.nix +++ b/pkgs/development/python-modules/service-identity/default.nix @@ -12,11 +12,12 @@ pyasn1-modules, pytestCheckHook, pythonOlder, + pyopenssl, }: buildPythonPackage rec { pname = "service-identity"; - version = "24.1.0"; + version = "24.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "pyca"; repo = pname; tag = version; - hash = "sha256-ibi9hls/VnVePv4fF2CyxI22P1RX6QpCwyeENWVPkx4="; + hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; }; nativeBuildInputs = [ @@ -42,6 +43,8 @@ buildPythonPackage rec { pyasn1-modules ]; + checkInputs = [ pyopenssl ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "service_identity" ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index fc0ab09fd0a4..6a5da56092d8 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -3,25 +3,10 @@ newScope, python3, recurseIntoAttrs, - fetchFromGitHub, }: # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { - python = python3.override { - self = self.python; - packageOverrides = self: super: { - service-identity = super.service-identity.overridePythonAttrs (oldAttrs: { - version = "24.2.0"; - src = fetchFromGitHub { - owner = "pyca"; - repo = "service-identity"; - tag = "24.2.0"; - hash = "sha256-onxCUWqGVeenLqB5lpUpj3jjxTM61ogXCQOGnDnClT4="; - }; - checkInputs = [ super.pyopenssl ]; - }); - }; - }; + python = python3; buildbot-pkg = self.callPackage ./pkg.nix { };