|
198 | 198 | # scripts for other platforms. That way a linux GHA can download the |
199 | 199 | # cached files without needing access to the actual build platform. |
200 | 200 | devShellsWithEvalOnLinux = devShellsWithToolsModule { evalSystem = "x86_64-linux"; }; |
201 | | - # Filter out JS and Windows shells from hydraJobs due to head.hackage hash mismatch in haskell.nix |
202 | | - # TODO: Remove this filter once upstream haskell.nix fixes the head.hackage hash |
203 | | - filterBroken = pkgs.lib.filterAttrs (name: _: |
204 | | - !(pkgs.lib.hasInfix "-js" name) && !(pkgs.lib.hasInfix "-windows" name)); |
205 | | - devShellsForCI = filterBroken devShells; |
206 | | - devShellsWithEvalOnLinuxForCI = filterBroken devShellsWithEvalOnLinux; |
207 | 201 | in { |
208 | 202 | inherit devShells; |
209 | | - hydraJobs = devShellsForCI // { |
| 203 | + hydraJobs = devShells // { |
210 | 204 | # *-dev sentinel job. Singals all -env have been built. |
211 | 205 | required = pkgs.runCommand "required dependencies (${system})" { |
212 | 206 | _hydraAggregate = true; |
213 | | - constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinuxForCI); |
| 207 | + constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinux); |
214 | 208 | } "touch $out"; |
215 | 209 | } // (pkgs.lib.mapAttrs' (name: drv: |
216 | 210 | pkgs.lib.nameValuePair "${name}-env" ( |
|
257 | 251 | license = pkgs.lib.licenses.asl20; |
258 | 252 | platforms = pkgs.lib.platforms.unix; |
259 | 253 | }; |
260 | | - })) devShellsForCI) |
| 254 | + })) devShells) |
261 | 255 | // (pkgs.lib.mapAttrs' (name: drv: |
262 | | - pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShellsForCI); |
| 256 | + pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShells); |
263 | 257 | packages.cabalProjectLocal-static = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template; |
264 | 258 | packages.cabalProjectLocal-cross-js = (import ./quirks.nix { pkgs = js-pkgs; }).template; |
265 | 259 | packages.cabalProjectLocal-cross-windows = (import ./quirks.nix { pkgs = windows-pkgs; }).template; |
|
0 commit comments