diff --git a/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch b/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch
deleted file mode 100644
index 1fadce445163..000000000000
--- a/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/master/buildbot/util/git.py b/master/buildbot/util/git.py
-index 0ed9ac3037f..49ef359537c 100644
---- a/master/buildbot/util/git.py
-+++ b/master/buildbot/util/git.py
-@@ -67,8 +67,8 @@ def getSshCommand(keyPath, knownHostsPath):
- 
- 
- def scp_style_to_url_syntax(address, port=22, scheme='ssh'):
--    if any(['://' in address, ':\\' in address, ':' not in address]):
--        # the address already has a URL syntax or is a local path
-+    if not isinstance(address, str) or any(['://' in address, ':\\' in address, ':' not in address]):
-+        # the address already has a URL syntax or is a local path or is a renderable
-         return address
-     host, path = address.split(':')
-     return f'{scheme}://{host}:{port}/{path}'
diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index 1d624c3fc17e..aa75150a1b3f 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -76,7 +76,7 @@ let
 in
 buildPythonApplication rec {
   pname = "buildbot";
-  version = "4.2.0";
+  version = "4.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -85,7 +85,7 @@ buildPythonApplication rec {
     owner = "buildbot";
     repo = "buildbot";
     rev = "v${version}";
-    hash = "sha256-eraNF2J5x04qQESkned/2Io9gb2ZL9XzUfWHwSGErNY=";
+    hash = "sha256-Kf8sxZE2cQDQSVSMpRTokJU4f3/M6OJq6bXzGonrRLU=";
   };
 
   build-system = [
@@ -143,9 +143,6 @@ buildPythonApplication rec {
     # This patch disables the test that tries to read /etc/os-release which
     # is not accessible in sandboxed builds.
     ./skip_test_linux_distro.patch
-
-    # https://github.com/buildbot/buildbot/issues/8274
-    ./allow_git_urls_to_be_renderable_again.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
index c13060fac8df..da78957e5271 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
@@ -18,7 +18,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-pd6ZzrFHKB/acffuM7TxUtXRsZTMIyoUWVqIiilJH/s=";
+      hash = "sha256-xwu260fcRfnUarEW3dnMcl8YheR0YmYCgNQGy7LaDGw=";
     };
 
     # Remove unnecessary circular dependency on buildbot
@@ -48,7 +48,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-XfELWX6d4Lat5ByNcsdw9qJd7FjUGL8GRqJkWHKjoTI=";
+      hash = "sha256-VtrgDVB+U4uM1SQ1h5IMFwU+nRcleYolDjQYJZ7iHbA=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -70,7 +70,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-1osf0WefIjogFk3BqRsX/pjVIzvd18W/NG8LyuFMI/U=";
+      hash = "sha256-q4RDjn9i4wHtCctqcNIfilS9SNfS+LHohE0dSMHMOt8=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -92,7 +92,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-3BqQTTj6WPbmHr6bzR4PcVnl8WcTKokY1YHLuwHYqLw=";
+      hash = "sha256-HrVoSXXo8P05JbJebKQ/bSPTIxQc9gTDT2RJLhJVhO8=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -114,7 +114,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-tZBsyaBhewXs0PWxJMtPJ3yv8Z3dS1wESmJI0beMG28=";
+      hash = "sha256-x/a3iAb8vNkplAoS57IX+4BxIcH9roCixrBArUQN+04=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -136,7 +136,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-oQ+exQ4eiF+y9JiYPXbJf9azJVgFZgbBby4MRcBLZgQ=";
+      hash = "sha256-kGH+Wuqn3vkATL8+aKjXbtuBEQro1tekut+7te8abQs=";
     };
 
     buildInputs = [ buildbot-pkg ];