Commit c61157bb authored by sternenseemann's avatar sternenseemann
Browse files

haskell.compiler.ghc{8107,902}: give cabal-paths.patch a better name

parent b04384c6

pkgs/development/compilers/ghc/8.10.7.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 .";

pkgs/development/compilers/ghc/9.0.2.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 .";