Skip to content

Commit 89b35ec

Browse files
committed
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.
1 parent 4f585de commit 89b35ec

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

packaging/hydra.nix

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ let
7373
]
7474
);
7575
in
76-
{
76+
rec {
7777
/**
7878
An internal check to make sure our package listing is complete.
7979
*/
@@ -145,18 +145,9 @@ in
145145
)
146146
);
147147

148-
buildNoGc =
149-
let
150-
components = forAllSystems (
151-
system:
152-
nixpkgsFor.${system}.native.nixComponents2.overrideScope (
153-
self: super: {
154-
nix-expr = super.nix-expr.override { enableGC = false; };
155-
}
156-
)
157-
);
158-
in
159-
forAllPackages (pkgName: forAllSystems (system: components.${system}.${pkgName}));
148+
# Builds with sanitizers already have GC disabled, so this buildNoGc can just
149+
# point to buildWithSanitizers in order to reduce the load on hydra.
150+
buildNoGc = buildWithSanitizers;
160151

161152
buildWithSanitizers =
162153
let

0 commit comments

Comments
 (0)