File tree Expand file tree Collapse file tree 1 file changed +1
-21
lines changed Expand file tree Collapse file tree 1 file changed +1
-21
lines changed Original file line number Diff line number Diff line change 1- diff --git a/flake.nix b/flake.nix
2- index e17573394..9afa5b2bd 100644
3- --- a/flake.nix
4- +++ b/flake.nix
5- @@ -388,7 +388,14 @@
6- lib.recursiveUpdate (removeAttrs systems [ "systemHydraJobs" "systemHydraJobsPr" "systemHydraJobsBors" ])
7- {
8- inherit overlay nixosModule nixosModules;
9- - hydraJobs = mkHydraJobs systems.systemHydraJobs;
10- + # Temporarily fix some merge bug – @michalrus
11- + hydraJobs =
12- + let hj = mkHydraJobs systems.systemHydraJobs; in
13- + hj // {
14- + macos = hj.macos // {
15- + silicon = systems.systemHydraJobs.aarch64-darwin.macos.silicon;
16- + };
17- + };
18- hydraJobsPr = mkHydraJobs systems.systemHydraJobsPr;
19- hydraJobsBors = mkHydraJobs systems.systemHydraJobsBors;
20- }
211diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
22- index 6e3f0d94e..5de7138b3 100644
2+ index 6e3f0d94e3..5de7138b32 100644
233--- a/nix/supported-systems.nix
244+++ b/nix/supported-systems.nix
255@@ -1,6 +1,5 @@
You can’t perform that action at this time.
0 commit comments