git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Try to get hydra to build Plutus GHC
commitbe667b07d83bba2a036debb76c1dd5ebe1b1d0bd authorShea Levy <shea@shealevy.com> dateSun 24 Apr 2022, 23:14 (4 years ago) parent2fd7940
2 files changed+3−3
compare with iko/ghcjs-patch-master
unifiedsplit
ci.nix+2−2 test/haskell-language-server/stack.nix+1−1
ci.nix+2−2
@@ -41,7 +41,7 @@
4141 ghc902 = true;
4242 ghc921 = false;
4343 ghc922 = true;
44− ghc810420210212 = false;
44+ ghc810420210212 = true;
4545 });
4646 systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
4747 nixpkgs.lib.filter (v:
@@ -63,7 +63,7 @@
6363 || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
6464 inherit (lib.systems.examples) ghcjs;
6565 } // lib.optionalAttrs (system == "x86_64-linux" &&
66− nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {
66+ nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc810420210212" "ghc8107"])) {
6767 # Windows cross compilation is currently broken on macOS
6868 inherit (lib.systems.examples) mingwW64;
6969 } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && compiler-nix-name == "ghc8107") {
test/haskell-language-server/stack.nix+1−1
@@ -22,5 +22,5 @@ in recurseIntoAttrs {
2222 build = project.hsPkgs.haskell-language-server.components.exes.haskell-language-server;
2323
2424 # Haskell Language Server does not build for GHC 9 or 8.10.7 yet
25− meta.disabled = __elem compiler-nix-name ["ghc922" "ghc921" "ghc901" "ghc902" "ghc8107"];
25+ meta.disabled = __elem compiler-nix-name ["ghc922" "ghc921" "ghc901" "ghc902" "ghc8107" "ghc810420210212" ];
2626}