Turn all the CI back on

Author: hamishmack

ci.nix

@@ -63,19 +63,19 @@
       # from here (so that is no longer cached) also remove ./materialized/ghcXXX.
       # Update supported-ghc-versions.md to reflect any changes made here.
       nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
-#        ghc96 = false;
-#        ghc98 = false;
-#        ghc910 = false;
-#        ghc912 = false;
+        ghc96 = false;
+        ghc98 = false;
+        ghc910 = false;
+        ghc912 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
-#        ghc96 = true;
-#        ghc98 = true;
-#        ghc98llvm = false;
-#        ghc910 = true;
-#        ghc910llvm = false;
+        ghc96 = true;
+        ghc98 = true;
+        ghc98llvm = false;
+        ghc910 = true;
+        ghc910llvm = false;
         ghc912 = true;
-#        ghc912llvm = true;
-#        ghc913 = true;
+        ghc912llvm = true;
+        ghc913 = true;
       })));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
     # We need to use the actual nixpkgs version we're working with here, since the values

flake.nix

@@ -101,9 +101,9 @@
 
       # systems supported by haskell.nix
       systems = [
-#        "x86_64-linux"
+        "x86_64-linux"
       ] ++ (if runningHydraEvalTest then [ ] else [
-#        "x86_64-darwin"
+        "x86_64-darwin"
         "aarch64-darwin"
       ]);
 
@@ -252,8 +252,8 @@
               cf.defaultNix.hydraJobs;
           in
           self.allJobs.${system}
-#          // lib.optionalAttrs (ifdLevel > 2)
-#            { nix-tools = nix-tools-hydraJobs.${system} or { }; }
+          // lib.optionalAttrs (ifdLevel > 2)
+            { nix-tools = nix-tools-hydraJobs.${system} or { }; }
         );
 
         devShells = forEachSystemPkgs (pkgs:
@@ -286,21 +286,21 @@
       (
         let pkgs = nixpkgs.legacyPackages."x86_64-linux"; in
         {
-#          hydraJobs.nix-tools = pkgs.releaseTools.aggregate {
-#            name = "nix-tools";
-#            constituents = (if runningHydraEvalTest then [ ] else [
-#              "aarch64-darwin.nix-tools.static.zipped.nix-tools-static"
-#              "x86_64-darwin.nix-tools.static.zipped.nix-tools-static"
-#              "aarch64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
-#              "x86_64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
-#            ]) ++ [
-#              "x86_64-linux.nix-tools.static.zipped.nix-tools-static"
-#              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64"
-#              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-no-ifd"
-#              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64-no-ifd"
-#              (pkgs.writeText "gitrev" (self.rev or "0000000000000000000000000000000000000000"))
-#            ];
-#          };
+          hydraJobs.nix-tools = pkgs.releaseTools.aggregate {
+            name = "nix-tools";
+            constituents = (if runningHydraEvalTest then [ ] else [
+              "aarch64-darwin.nix-tools.static.zipped.nix-tools-static"
+              "x86_64-darwin.nix-tools.static.zipped.nix-tools-static"
+              "aarch64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
+              "x86_64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
+            ]) ++ [
+              "x86_64-linux.nix-tools.static.zipped.nix-tools-static"
+              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64"
+              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-no-ifd"
+              "x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64-no-ifd"
+              (pkgs.writeText "gitrev" (self.rev or "0000000000000000000000000000000000000000"))
+            ];
+          };
         }
       )));
 

test/cabal.project.local

@@ -1,4 +1,3 @@
--- Test IFDs 5
 if impl(ghc>=9.12.1)
   -- allow newer packages, that are bound to be newer due to
   -- being shipped with a newer compiler.  If you extend this