Skip to content

Commit 8ddd9d2

Browse files
committed
Fix head.hackage hash and remove CI filter workaround
Update the head.hackage repository hash in tool-map.nix to the current value. This fixes the JS and Windows cross-compilation builds that were failing due to hash mismatch. Remove the temporary filter that excluded JS/Windows builds from hydraJobs since the root cause is now fixed.
1 parent 8c3a041 commit 8ddd9d2

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

flake.nix

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,19 +198,13 @@
198198
# scripts for other platforms. That way a linux GHA can download the
199199
# cached files without needing access to the actual build platform.
200200
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;
207201
in {
208202
inherit devShells;
209-
hydraJobs = devShellsForCI // {
203+
hydraJobs = devShells // {
210204
# *-dev sentinel job. Singals all -env have been built.
211205
required = pkgs.runCommand "required dependencies (${system})" {
212206
_hydraAggregate = true;
213-
constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinuxForCI);
207+
constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinux);
214208
} "touch $out";
215209
} // (pkgs.lib.mapAttrs' (name: drv:
216210
pkgs.lib.nameValuePair "${name}-env" (
@@ -257,9 +251,9 @@
257251
license = pkgs.lib.licenses.asl20;
258252
platforms = pkgs.lib.platforms.unix;
259253
};
260-
})) devShellsForCI)
254+
})) devShells)
261255
// (pkgs.lib.mapAttrs' (name: drv:
262-
pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShellsForCI);
256+
pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShells);
263257
packages.cabalProjectLocal-static = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
264258
packages.cabalProjectLocal-cross-js = (import ./quirks.nix { pkgs = js-pkgs; }).template;
265259
packages.cabalProjectLocal-cross-windows = (import ./quirks.nix { pkgs = windows-pkgs; }).template;

tool-map.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let
1515
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
1616
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
1717
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
18-
--sha256: sha256-5gKLigkUTkkABGG8B9zNq8NKRIHv97K9No4kTLK/GyQ=
18+
--sha256: sha256-AO/vHIMSIBwjbp5GY561SmnPr5qTTyBt9ruy8D3lKZI=
1919
2020
if impl(ghc < 9.13)
2121
active-repositories: hackage.haskell.org

0 commit comments

Comments
 (0)