From 942ea8c7af8dcc8e5dc5184ddeaecb0a1d60b761 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:54:13 +1000 Subject: [PATCH] Revert "buildbot: add patch for compatibility with twisted 24.11.0" This reverts commit 0dd7250c735247a9c6365e6624b37da2a826dbf9. fixed in 4.2.0 edb59b6d8e0b1d3595887d29863140b429e51b85 --- .../tools/continuous-integration/buildbot/master.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 386540681c3a..1d624c3fc17e 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -43,7 +43,6 @@ unidiff, glibcLocales, nixosTests, - fetchpatch, }: let @@ -141,11 +140,6 @@ buildPythonApplication rec { ]; patches = [ - (fetchpatch { - name = "remove-uses-of-twisted-python-constants.patch"; - url = "https://github.com/buildbot/buildbot/commit/ac46c0aa77be46eaa64e09bef03da6f8dbaacfa7.patch"; - hash = "sha256-XoODSKY0GzFh2H5gWxiXm/QxngGN2MM0yId5D1RQflQ="; - }) # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch