Update core interface files GHC to 8.10.4

Author: hamishmack

ci.nix

@@ -29,10 +29,10 @@
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
       ghc884 = true;
       ghc8104 = true;
-      ghc810220201118 = false;
     } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
       ghc884 = true;
       ghc8104 = true;
+      ghc810420210212 = false;
     });
   systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
     # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -46,7 +46,7 @@
     in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (system == "x86_64-linux" && (
-         (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])
+         (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810420210212"])
       || (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) {
     # Windows cross compilation is currently broken on macOS
     inherit (lib.systems.examples) mingwW64;

overlays/bootstrap.nix

@@ -423,9 +423,9 @@ in {
 
                 ghc-patches = ghc-patches "8.10.4";
             };
-            # ghc 8.10.2 with patches needed by plutus
-            ghc810220201118 = final.callPackage ../compiler/ghc {
-                extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc810220201118; };
+            # ghc 8.10.4 with patches needed by plutus
+            ghc810420210212 = final.callPackage ../compiler/ghc {
+                extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc810420210212; };
 
                 bootPkgs = bootPkgs // {
                   # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
@@ -437,16 +437,15 @@ in {
                 llvmPackages = final.llvmPackages_9;
 
                 src-spec = rec {
-                    version = "8.10.2";
+                    version = "8.10.4";
                     url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-                    sha256 = "02w8n085bw38vyp694j0lfk5wcnwkdaj7hhp0saj71x74533lmww";
+                    sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
                 };
-
-                ghc-patches = ghc-patches "8.10.2"
+                ghc-patches = ghc-patches "8.10.4"
                  ++ [ ./patches/ghc/core-field.patch ];
 
-                # Avoid clashes with normal ghc8102
-                ghc-version = "8.10.2.20201118";
+                # Avoid clashes with normal ghc8104
+                ghc-version = "8.10.4.20210212";
             };
         } // final.lib.optionalAttrs (final.targetPlatform.isGhcjs or false) (
          if final.hostPlatform.isGhcjs

test/default.nix

@@ -202,7 +202,7 @@ let
     coverage-golden = callTest ./coverage-golden { inherit compiler-nix-name;};
     coverage-no-libs = callTest ./coverage-no-libs { inherit compiler-nix-name; };
     snapshots = callTest ./snapshots {};
-  } // lib.optionalAttrs (!stdenv.hostPlatform.isGhcjs && !(__elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])) {
+  } // lib.optionalAttrs (!stdenv.hostPlatform.isGhcjs && !(__elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810420210212"])) {
     # Pandoc does not build with ghcjs or ghc 8.10 yet (lookup-sha256 and fully-static build pandoc)
     lookup-sha256 = callTest ./lookup-sha256 { inherit compiler-nix-name; };
     # fully-static = callTest ./fully-static { inherit (pkgs) buildPackages; };

test/setup-deps/default.nix

@@ -20,7 +20,7 @@ let
     platforms = platforms.unix;
     # Building reinstallable lib GHC is broken on 8.10, and we require lib ghc so this won't work with cross-compiling.
     # Moreover, even building the plan doesn't seem to work in these circumstances.
-    disabled = stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isMusl || __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"];
+    disabled = stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isMusl || __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810420210212"];
   };
 in