From 970a97f97368dea975713e8979d0c472d9d17e15 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 22 Aug 2022 21:12:30 +0200
Subject: [PATCH] haskell.compiler: ghc941 -> ghc942

---
 .../compilers/ghc/{9.4.1.nix => 9.4.2.nix}       | 16 +++-------------
 pkgs/top-level/haskell-packages.nix              | 12 ++++++------
 2 files changed, 9 insertions(+), 19 deletions(-)
 rename pkgs/development/compilers/ghc/{9.4.1.nix => 9.4.2.nix} (96%)

diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.2.nix
similarity index 96%
rename from pkgs/development/compilers/ghc/9.4.1.nix
rename to pkgs/development/compilers/ghc/9.4.2.nix
index 71921f5e7639..cd353541da90 100644
--- a/pkgs/development/compilers/ghc/9.4.1.nix
+++ b/pkgs/development/compilers/ghc/9.4.2.nix
@@ -1,4 +1,4 @@
-# Preliminary GHC 9.4.1 expression using the make build system.
+# Preliminary GHC 9.4.2 expression using the make build system.
 # TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6
 # where make support will be dropped.
 { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages
@@ -177,12 +177,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
 assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
 
 stdenv.mkDerivation (rec {
-  version = "9.4.1";
+  version = "9.4.2";
   pname = "${targetPrefix}ghc${variantSuffix}";
 
   src = fetchurl {
     url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
+    sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5";
   };
 
   enableParallelBuilding = true;
@@ -190,16 +190,6 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "doc" ];
 
 
-  patches = [
-    # add missing profiling targets in make build system
-    (fetchpatch {
-      name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
-      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
-      sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
-    })
-    ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
-  ];
-
   postPatch = "patchShebangs .";
 
   # GHC needs the locale configured during the Haddock phase.
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b38853008757..caa84277b0e2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -16,14 +16,14 @@ let
     "native-bignum"
     "ghc902"
     "ghc924"
-    "ghc941"
+    "ghc942"
     "ghcHEAD"
   ];
 
   nativeBignumIncludes = [
     "ghc902"
     "ghc924"
-    "ghc941"
+    "ghc942"
     "ghcHEAD"
   ];
 
@@ -155,7 +155,7 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
       llvmPackages = pkgs.llvmPackages_12;
     };
-    ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {
+    ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
       bootPkgs =
         # Building with 9.2 is broken due to
         # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
@@ -291,9 +291,9 @@ in {
       ghc = bh.compiler.ghc924;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
     };
-    ghc941 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc941;
-      ghc = bh.compiler.ghc941;
+    ghc942 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc942;
+      ghc = bh.compiler.ghc942;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
     };
     ghcHEAD = callPackage ../development/haskell-modules {