From 298b99bc6ef4981827aced159820fe548d921e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 5 Jan 2025 11:11:01 +0100 Subject: [PATCH] Revert "buildbot: python3Packages.service-identity: 24.1.0 -> 24.2.0" This reverts commit 7f9857f4bdb84f223cf97029dcfe33887e2f5b19. We update the global version now instead. --- .../continuous-integration/buildbot/default.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 { };