From 5ff2bdb944fd1563b0a6737f6a9b53832b08e79d Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 7 Jun 2021 22:48:58 +1200 Subject: [PATCH] Add ghc 8.8.4 native (used to boot 9.0.1). Remove ghcjs 8.6. --- ci.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.nix b/ci.nix index e21fb7eae4..10b2ea700c 100644 --- a/ci.nix +++ b/ci.nix @@ -30,6 +30,7 @@ ghc8104 = true; } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") { ghc865 = false; + ghc884 = false; # Native version is used to boot 9.0.1 ghc8104 = true; ghc901 = true; ghc810420210212 = false; @@ -43,7 +44,7 @@ # We need to use the actual nixpkgs version we're working with here, since the values # of 'lib.systems.examples' are not understood between all versions let lib = nixpkgs.lib; - in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc865" "ghc8104"])) { + in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8104"])) { inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104"])) {