Skip to content

Commit 284f3dc

Browse files
committed
Better way to disable macOS
1 parent 64fed0e commit 284f3dc

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

flake.nix

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
callFlake = import flake-compat;
9292

9393
ifdLevel = 3;
94-
runningHydraEvalTest = false;
94+
# TODO set this to false when the macOS builders for ci.zw3rk.com are back online
95+
runningHydraEvalTest = true;
9596
defaultCompiler = "ghc967";
9697
config = import ./config.nix;
9798

@@ -110,9 +111,8 @@
110111
systems = [
111112
"x86_64-linux"
112113
] ++ (if runningHydraEvalTest then [ ] else [
113-
# TODO put these back when the macOS builders for ci.zw3rk.com are back online
114-
# "x86_64-darwin"
115-
# "aarch64-darwin"
114+
"x86_64-darwin"
115+
"aarch64-darwin"
116116
]);
117117

118118
nixpkgsArgs = {
@@ -297,11 +297,10 @@
297297
hydraJobs.nix-tools = pkgs.releaseTools.aggregate {
298298
name = "nix-tools";
299299
constituents = (if runningHydraEvalTest then [ ] else [
300-
# TODO put these back when the macOS builders for ci.zw3rk.com are back online
301-
# "aarch64-darwin.nix-tools.static.zipped.nix-tools-static"
302-
# "x86_64-darwin.nix-tools.static.zipped.nix-tools-static"
303-
# "aarch64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
304-
# "x86_64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
300+
"aarch64-darwin.nix-tools.static.zipped.nix-tools-static"
301+
"x86_64-darwin.nix-tools.static.zipped.nix-tools-static"
302+
"aarch64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
303+
"x86_64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
305304
]) ++ [
306305
"x86_64-linux.nix-tools.static.zipped.nix-tools-static"
307306
"x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64"

0 commit comments

Comments
 (0)