diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-03-10 13:53:30 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-03-11 12:22:48 +0100 |
| commit | c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f (patch) | |
| tree | fce925a7e667bfa040deef81616233d13ac5eaff | |
| parent | b04384c65cf338adb7a909e6bc58a296f4f440c4 (diff) | |
| download | nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar.gz nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar.bz2 nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar.lz nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar.xz nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.tar.zst nixpkgs-c61157bbe3f29b7cffe8f8f5505ed9d9a50b5f8f.zip | |
haskell.compiler.ghc{8107,902}: give cabal-paths.patch a better name
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.7.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/9.0.2.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch (renamed from pkgs/development/compilers/ghc/cabal-paths.patch) | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index afc06e09edb..4d220d97243 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -226,14 +226,13 @@ stdenv.mkDerivation (rec { sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) ] ++ 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 ."; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index f69e52701a9..783c7ae5025 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -205,14 +205,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 ."; diff --git a/pkgs/development/compilers/ghc/cabal-paths.patch b/pkgs/development/compilers/ghc/Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch index 19adcf5388b..19adcf5388b 100644 --- a/pkgs/development/compilers/ghc/cabal-paths.patch +++ b/pkgs/development/compilers/ghc/Cabal-3.2-3.4-paths-fix-cycle-aarch64-darwin.patch |