summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc/9.0.2.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-03-11 12:01:11 +0000
committerGitHub <noreply@github.com>2023-03-11 12:01:11 +0000
commit140a35879a1bec9907a15a66b6350e0efbef5239 (patch)
tree2707ac4775c576a5556954fb0f7517f6a267e2af /pkgs/development/compilers/ghc/9.0.2.nix
parent5c84dd188140df37e1875c6d2d3ef33fed289375 (diff)
parentdae678ad8f381e1593c1beb9145953285b1d1bbc (diff)
downloadnixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar.gz
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar.bz2
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar.lz
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar.xz
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.tar.zst
nixpkgs-140a35879a1bec9907a15a66b6350e0efbef5239.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/ghc/9.0.2.nix')
-rw-r--r--pkgs/development/compilers/ghc/9.0.2.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix
index 7cd6171bb34..acbfe3bbcc2 100644
--- a/pkgs/development/compilers/ghc/9.0.2.nix
+++ b/pkgs/development/compilers/ghc/9.0.2.nix
@@ -212,14 +212,13 @@ stdenv.mkDerivation (rec {
       sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
     })
   ] ++ 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-paths.patch
+    ./Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch
   ];
 
   postPatch = "patchShebangs .";