Add stable-ghc-9.14

ci.nix

@@ -3,7 +3,7 @@
 { ifdLevel # This is passed in from flake.nix
 , checkMaterialization ? false
 , system ? builtins.currentSystem
-, evalSystem ? builtins.currentSystem or "x86_64-linux"
+, evalSystem ? "aarch64-darwin"
   # NOTE: we apply checkMaterialization when defining nixpkgsArgs
 , haskellNix ? import ./default.nix { inherit system ; }
 }:
@@ -75,7 +75,8 @@
         ghc910llvm = false;
         ghc912 = true;
         ghc912llvm = true;
-        ghc913 = true;
+        ghc914X = true;
+        ghc915 = true;
       })));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
     # We need to use the actual nixpkgs version we're working with here, since the values

compiler/ghc/default.nix

@@ -601,6 +601,11 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
       # The official ghc 9.2.3 tarball requires booting.
       + lib.optionalString (ghc-version == "9.2.3" || ghc-version == "9.8.20230704" || src-spec.needsBooting or false) ''
         python3 ./boot
+    '' + lib.optionalString (builtins.compareVersions ghc-version "9.14" > 0) ''
+        mkdir -p libraries/ghc-boot-th-next
+        cp libraries/ghc-boot-th/ghc-boot-th.cabal.in libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in
+        substituteInPlace libraries/ghc-boot-th-next/ghc-boot-th-next.cabal.in \
+          --replace-fail "ghc-boot-th" "ghc-boot-th-next"
     '';
 
   configurePlatforms = [ "build" "host" ] ++ lib.optional (!targetPlatform.isGhcjs) "target";
@@ -646,7 +651,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx
     ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ] ++ lib.optional (patches != []) autoreconfHook
+    autoreconfHook ]
   ++ lib.optional useLdLld llvmPackages.bintools
   ++ lib.optional (targetPlatform.isWasm) nodejs;
 

flake.nix

@@ -103,6 +103,7 @@
       systems = [
         "x86_64-linux"
       ] ++ (if runningHydraEvalTest then [ ] else [
+        "aarch64-linux"
         "x86_64-darwin"
         "aarch64-darwin"
       ]);

lazy-inputs/default.nix

@@ -39,8 +39,8 @@ in {
       inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
       inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
       inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
-      inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
-      inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
+      inherit ((callFlake { pkgs = final; src = ./ghc914X; }).defaultNix) ghc914X;
+      inherit ((callFlake { pkgs = final; src = ./ghc915; }).defaultNix) ghc915;
       inherit ((callFlake { pkgs = final; src = ./libffi-wasm; }).defaultNix) libffi-wasm;
     } // prev.haskell-nix.sources;
   };

lazy-inputs/ghc912X/flake.nix → lazy-inputs/ghc914X/flake.nix

@@ -2,9 +2,9 @@
   description = "Lazy Input for Haskell.nix";
 
   inputs = {
-    ghc912X = {
+    ghc914X = {
       flake = false;
-      url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.12&submodules=1";
+      url = "git+https://github.com/stable-haskell/ghc?ref=stable-ghc-9.14&submodules=1";
     };
   };
 

lazy-inputs/ghc913/flake.nix → lazy-inputs/ghc915/flake.nix

@@ -2,7 +2,7 @@
   description = "Lazy Input for Haskell.nix";
 
   inputs = {
-    ghc913 = {
+    ghc915 = {
       flake = false;
       url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
     };

lib/call-cabal-project-to-nix.nix

@@ -512,7 +512,7 @@ let
                 PKGS+=" ${name}"
                 LAST_PKG="${name}"
               fi
-            '') (pkgs.haskell-nix.ghc-pre-existing ghc))
+            '') (pkgs.lib.filter (n: n != "system-cxx-std-lib") (pkgs.haskell-nix.ghc-pre-existing ghc)))
           }
           ${ # There is no .cabal file for system-cxx-std-lib
             pkgs.lib.optionalString (builtins.compareVersions ghc.version "9.2" >= 0) (

overlays/bootstrap.nix

@@ -15,8 +15,8 @@ let
     };
     gitInputs = {
       ghc96X = "9.6.7";
-      ghc912X = "9.12.1";
-      ghc913 = "9.13";
+      ghc914X = "9.14.0";
+      ghc915 = "9.15";
     };
     versionToNixName = v: "ghc${builtins.replaceStrings ["."] [""] v}";
     compilerNameMap =
@@ -336,7 +336,7 @@ in {
 
                 ++ onGhcjs (from        "9.12"         ./patches/ghc/ghc-9.12-ghcjs-rts-mem-heap8.patch)
                 # Fix for `fatal error: 'rts/Types.h' file not found` when building `primitive`
-                ++ onGhcjs (from        "9.13"         ./patches/ghc/ghc-9.13-ghcjs-rts-types.patch)
+                ++ onGhcjs (fromUntil   "9.13" "9.14"  ./patches/ghc/ghc-9.13-ghcjs-rts-types.patch)
 
                 ++ onGhcjs (fromUntil   "9.6.7" "9.7"  ./patches/ghc/ghc-9.6-js-support-this-unit-id-10819.patch)