Update GHC version to 8.10.7 to get Mac builders unstuck.

nix/pkgs/haskell/default.nix

@@ -24,10 +24,8 @@ let
     in
     parseIndexState (builtins.readFile ../../../cabal.project);
 
-  # The compiler that we are using. We are using a patched version so we need to specify it explicitly.
-  # This version has the experimental core interface files patch, and a fix for unboxed tuples in
-  # GHCi, which helps with HLS.
-  compiler-nix-name = "ghc810420210212";
+  # The compiler that we are using
+  compiler-nix-name = "ghc8107";
 
   # The haskell project created by haskell-nix.stackProject'
   baseProject =

nix/pkgs/haskell/extra.nix

@@ -44,8 +44,6 @@ let
       "https://github.com/haskell/lsp.git"."ef59c28b41ed4c5775f0ab0c1e985839359cec96" = "1whcgw4hhn2aplrpy9w8q6rafwy7znnp0rczgr6py15fqyw2fwb5";
     };
     modules = [{
-      # for compatibility with the GHC patch for extensible interfaces, not needed on mainline GHC.
-      packages.ghcide.patches = [ ../../patches/ghcide_partial_iface.patch ];
       # Workaround for https://github.com/haskell/haskell-language-server/issues/1160
       packages.haskell-language-server.patches = lib.mkIf stdenv.isDarwin [ ../../patches/haskell-language-server-dynamic.patch ];
       # See https://github.com/haskell/haskell-language-server/pull/1382#issuecomment-780472005

release.nix

@@ -20,7 +20,7 @@ let
   # ci.nix is a set of attributes that work fine as jobs (albeit in a slightly different structure, the platform comes
   # first), but we mainly just need to get rid of some extra attributes.
   ciJobsets = stripAttrsForHydra (filterDerivations ci);
-  # Don't require darwin jobs to succeed for now, until the mac builders are fixed
-  requiredJobsets = builtins.removeAttrs ciJobsets [ "darwin" ];
+  # Don't filter anything out of required for now
+  requiredJobsets = ciJobsets;
 in
 traceNames "" (ciJobsets // { required = derivationAggregate "required-plutus-apps" requiredJobsets; })