haskell.compiler.ghc94*: apply Cabal cycle patch on aarch64-darwin

This was already applied to GHC 9.2.x, but was not copied to GHC 9.4.x.
I have had issues with this locally.

The same patch works for both Cabal 3.6 and 3.8, so we can just reuse it.
This commit is contained in:
Samir Talwar 2023-08-07 13:32:23 +02:00 committed by sternenseemann
parent 557117947d
commit f6f780f129
10 changed files with 37 additions and 5 deletions

View file

@ -216,7 +216,7 @@ stdenv.mkDerivation (rec {
# These cause problems as they're not eliminated by GHC's dead code # These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see # elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details). # https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -216,7 +216,7 @@ stdenv.mkDerivation (rec {
# These cause problems as they're not eliminated by GHC's dead code # These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see # elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details). # https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -216,7 +216,7 @@ stdenv.mkDerivation (rec {
# These cause problems as they're not eliminated by GHC's dead code # These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see # elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details). # https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -216,7 +216,7 @@ stdenv.mkDerivation (rec {
# These cause problems as they're not eliminated by GHC's dead code # These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see # elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details). # https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -216,7 +216,7 @@ stdenv.mkDerivation (rec {
# These cause problems as they're not eliminated by GHC's dead code # These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see # elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details). # https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -196,6 +196,14 @@ stdenv.mkDerivation (rec {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
}) })
] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
# Prevent the paths module from emitting symbols that we don't use
# when building with separate outputs.
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -196,6 +196,14 @@ stdenv.mkDerivation (rec {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
}) })
] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
# Prevent the paths module from emitting symbols that we don't use
# when building with separate outputs.
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -205,6 +205,14 @@ stdenv.mkDerivation (rec {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
}) })
] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
# Prevent the paths module from emitting symbols that we don't use
# when building with separate outputs.
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";

View file

@ -205,6 +205,14 @@ stdenv.mkDerivation (rec {
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
}) })
] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
# Prevent the paths module from emitting symbols that we don't use
# when building with separate outputs.
#
# These cause problems as they're not eliminated by GHC's dead code
# elimination on aarch64-darwin. (see
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch
]; ];
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";