summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc/9.0.2.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-03-31 13:48:17 +0200
committerRobert Hensing <robert@roberthensing.nl>2022-03-31 13:48:17 +0200
commit76be6eaf29de81e7cdbad268e8f90106dcf021b5 (patch)
tree2a213180119357d1f2cf7e2ae4ff62b2a580aeb9 /pkgs/development/compilers/ghc/9.0.2.nix
parent9d270f0381bd02abaf6b69492d283faee8df66f8 (diff)
downloadnixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar.gz
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar.bz2
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar.lz
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar.xz
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.tar.zst
nixpkgs-76be6eaf29de81e7cdbad268e8f90106dcf021b5.zip
haskell.compiler.ghc902: Backport -fcompact-unwind
Diffstat (limited to 'pkgs/development/compilers/ghc/9.0.2.nix')
-rw-r--r--pkgs/development/compilers/ghc/9.0.2.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix
index 04e29ed6686..0968b853992 100644
--- a/pkgs/development/compilers/ghc/9.0.2.nix
+++ b/pkgs/development/compilers/ghc/9.0.2.nix
@@ -5,6 +5,7 @@
 , autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr
 , autoSignDarwinBinariesHook
 , bash
+, fetchpatch
 
 , libiconv ? null, ncurses
 , glibcLocales ? null
@@ -182,6 +183,17 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
+  patches = [
+    # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
+    (fetchpatch {
+      name = "ghc-9.0.2-fcompact-unwind.patch";
+      # Note that the test suite is not packaged.
+      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
+      sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
+    })
+  ];
+
   postPatch = "patchShebangs .";
 
   # GHC needs the locale configured during the Haddock phase.