JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use .diff, not .patch, and fix sha hashes

Browse Source
This commit is contained in:
Joachim Breitner 2020-03-29 21:07:48 +02:00
parent b872b8a200
commit 29ca177c68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/ghc/8.4.4.nix
View File

@ -96,8 +96,8 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
patches = [(fetchpatch { patches = [(fetchpatch {
url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.patch"; url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff";
sha256 = "1q3rg7lka5czsryzj2nfr3f2iy2zw87kfd54hc4dlxz79z3vwz8p"; sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
extraPrefix = "utils/hsc2hs/"; extraPrefix = "utils/hsc2hs/";
stripLen = 1; stripLen = 1;
}) (fetchpatch rec { # https://phabricator.haskell.org/D5123 }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
@ -112,8 +112,8 @@ stdenv.mkDerivation (rec {
}) })
++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch { ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.patch"; url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.diff";
sha256 = "0ck3a26bvy6w3jy2x19zgixpfs3ig1ycdnq08xia1dd8gik9hjgf"; sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz";
}); });
postPatch = "patchShebangs ."; postPatch = "patchShebangs .";