Update flake.nix to make GHC 9.10.1 and GHC 9.8.2 available (#2810)

* Update GHC 9.6.2 to 9.6.6.

* Enable GHC 9.8.2 and remove GHC 9.0.2.

* Export ghcVersion from flake.nix.

* Remove Hackage calls for packages already in nixpkgs.

* Add GHC 9.10.1.

* Add comments to overlays.

* Make GHC 9.10 the default in flake.nix.

* Remove commented code.

Author: diegodiv

flake.lock

@@ -83,6 +83,9 @@
       in
       assert pkgs.lib.asserts.assertOneOf "defaultGhcVersion" defaultGhcVersion ghcVersions;
       {
+        # Export the variable so that other flakes can use it.
+        ghcVersion = defaultGhcVersion;
+
         packages = {
           inherit (pkgs."clashPackages-${defaultGhcVersion}")
             clash-benchmark

flake.nix

@@ -25,15 +25,15 @@ in
   hedgehog-fakedata = doJailbreak (markUnbroken prev.hedgehog-fakedata);
 
   # Fails on GHC 9.10 with:
-  #   library/Text/Regex/PCRE/Heavy.hs:123: failure in expression `head $ scan [re|\s*entry (\d+) (\w+)\s*&?|] (" entry 1 hello  &entry 2 hi" :: String)'
-  # expected: (" entry 1 hello  &",["1","hello"])
-  #  but got: <interactive>:55:1: warning: [GHC-63394] [-Wx-partial]
-  #           ^
-  #               In the use of ‘head’
+  #   library/Text/Regex/PCRE/Heavy.hs:123: failure in expression `head $ scan [re|\s*entry (\d+) (\w+)\s*&?|] (" entry 1 hello  &entry 2 hi" :: String)'                                                           
+  # expected: (" entry 1 hello  &",["1","hello"])                                                                                                                                                                 
+  #  but got: <interactive>:55:1: warning: [GHC-63394] [-Wx-partial]                                                                                                                                              
+  #           ^                                                                                                                                                                                  
+  #               In the use of ‘head’                                                                                                                                                                 
   #               (imported from Prelude.Compat, but defined in GHC.Internal.List):
   #               "This is a partial function, it throws an error on empty lists. Use pattern matching, 'Data.List.uncons' or 'Data.Maybe.listToMaybe' instead. Consider refactoring to use "Data.List.NonEmpty"."
   # (" entry 1 hello  &",["1","hello"])
-
+                                                                                                                                                                                                              
   pcre-heavy = dontCheck prev.pcre-heavy;
 
   # Relies on older versions of text.
@@ -46,17 +46,6 @@ in
 
   th-desugar = prev.th-desugar_1_17;
 
-  # We need a new tasty-flaky. The one from Hackage doesn't build for some weird
-  # reason..
-  tasty-flaky = prev.callCabal2nix "tasty-flaky" (pkgs.fetchFromGitHub {
-    owner = "LaurentRDC";
-    repo  = "tasty-flaky";
-    rev = "fc31a9d622c1eb60030a50152258a9bef785e365";
-    sha256 = "sha256-irLM3aVMxpBgsM72ArulMXcoLY2glalVkG//Lrj2JBI=";
-  }) {};
-
-  tasty = prev.tasty_1_5;
-
   singletons-th = prev.singletons-th_3_4;
 
   # nixplgs doesn't include revision 1, changing dependency on template-haskell.

nix/overlay-ghc910.nix

@@ -1,7 +1,7 @@
 { pkgs }:
 final: prev:
 let
-  inherit (pkgs.haskell.lib) doJailbreak markUnbroken dontCheck;
+  inherit (pkgs.haskell.lib) doJailbreak markUnbroken;
 in
 {
   # Use an older version than the default in nixpkgs. Since rewrite-inspector
@@ -41,24 +41,4 @@ in
 
   # Marken as broken, but compiles anyway.
   hedgehog-fakedata = doJailbreak (markUnbroken prev.hedgehog-fakedata);
-
-  # We need a new tasty-flaky. The one from Hackage doesn't build for some weird
-  # reason..
-  tasty-flaky = prev.callCabal2nix "tasty-flaky" (pkgs.fetchFromGitHub {
-    owner = "LaurentRDC";
-    repo  = "tasty-flaky";
-    rev = "fc31a9d622c1eb60030a50152258a9bef785e365";
-    sha256 = "sha256-irLM3aVMxpBgsM72ArulMXcoLY2glalVkG//Lrj2JBI=";
-  }) {};
-
-  # This version of tasty isn't available in the nix ghc96 package set
-  tasty = prev.callHackageDirect {
-    pkg = "tasty";
-    ver = "1.5.3";
-    sha256 = "sha256-Ogd8J4aHNeL+xmcRWuJeGBNaePyLs5yo1IoMzvWrVPY=";
-  } {};
-
-  # The tests (not the package itself!) require a tasty <1.5, which won't work as we pull in
-  # tasty 1.5.3. Solution: don't test!
-  time-compat = dontCheck prev.time-compat;
 }

nix/overlay-ghc96.nix

@@ -1,7 +1,7 @@
 { pkgs }:
 final: prev:
 let
-  inherit (pkgs.haskell.lib) doJailbreak markUnbroken dontCheck;
+  inherit (pkgs.haskell.lib) doJailbreak markUnbroken;
 in
 {
   # Use an older version than the default in nixpkgs. Since rewrite-inspector
@@ -20,24 +20,4 @@ in
 
   # Marken as broken, but compiles anyway.
   hedgehog-fakedata = doJailbreak (markUnbroken prev.hedgehog-fakedata);
-
-  # We need a new tasty-flaky. The one from Hackage doesn't build for some weird
-  # reason..
-  tasty-flaky = prev.callCabal2nix "tasty-flaky" (pkgs.fetchFromGitHub {
-    owner = "LaurentRDC";
-    repo  = "tasty-flaky";
-    rev = "fc31a9d622c1eb60030a50152258a9bef785e365";
-    sha256 = "sha256-irLM3aVMxpBgsM72ArulMXcoLY2glalVkG//Lrj2JBI=";
-  }) {};
-
-  # This version of tasty isn't available in the nix ghc96 package set
-  tasty = prev.callHackageDirect {
-    pkg = "tasty";
-    ver = "1.5.3";
-    sha256 = "sha256-Ogd8J4aHNeL+xmcRWuJeGBNaePyLs5yo1IoMzvWrVPY=";
-  } {};
-
-  # The tests (not the package itself!) require a tasty <1.5, which won't work as we pull in
-  # tasty 1.5.3. Solution: don't test!
-  time-compat = dontCheck prev.time-compat;
 }