From 89b35ec0dce03b41a01899b04b9b116f7cdf85c5 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Sun, 12 Oct 2025 22:10:35 +0300
Subject: [PATCH] packaging/hydra: buildNoGC is the same as buildWithSanitizers

This will reduce the load on hydra. It doesn't make sense to
build 2 slightly different variations where the difference
is only in the nix-perl-bindings and additional sanitizers.
---
 packaging/hydra.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/packaging/hydra.nix b/packaging/hydra.nix
index ae2e6ab98..bc75b5dfb 100644
--- a/packaging/hydra.nix
+++ b/packaging/hydra.nix
@@ -73,7 +73,7 @@ let
       ]
     );
 in
-{
+rec {
   /**
     An internal check to make sure our package listing is complete.
   */
@@ -145,18 +145,9 @@ in
       )
   );
 
-  buildNoGc =
-    let
-      components = forAllSystems (
-        system:
-        nixpkgsFor.${system}.native.nixComponents2.overrideScope (
-          self: super: {
-            nix-expr = super.nix-expr.override { enableGC = false; };
-          }
-        )
-      );
-    in
-    forAllPackages (pkgName: forAllSystems (system: components.${system}.${pkgName}));
+  # Builds with sanitizers already have GC disabled, so this buildNoGc can just
+  # point to buildWithSanitizers in order to reduce the load on hydra.
+  buildNoGc = buildWithSanitizers;
 
   buildWithSanitizers =
     let