Merge pull request #7039 from utdemir/master

Fix some build failures on GHC 7.10.1

+18 -2
+18 -2
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
··· 89 barecheck = doJailbreak super.barecheck; 90 cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); 91 92 # https://github.com/kazu-yamamoto/unix-time/issues/30 93 unix-time = dontCheck super.unix-time; 94 95 # Until the changes have been pushed to Hackage 96 haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { 97 url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; 98 - sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w"; 99 }); 100 foldl = appendPatch super.foldl (pkgs.fetchpatch { 101 url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; ··· 108 }); 109 stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { 110 url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; 111 - sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g"; 112 }); 113 mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { 114 url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
··· 89 barecheck = doJailbreak super.barecheck; 90 cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); 91 92 + syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { 93 + url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; 94 + sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; 95 + }); 96 + 97 + wl-pprint = overrideCabal super.wl-pprint (drv: { 98 + patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; 99 + }); 100 + 101 + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { 102 + patchPhase = '' 103 + sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs 104 + sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs 105 + ''; 106 + }); 107 + 108 # https://github.com/kazu-yamamoto/unix-time/issues/30 109 unix-time = dontCheck super.unix-time; 110 111 # Until the changes have been pushed to Hackage 112 haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { 113 url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; 114 + sha256 = "0idf12b2wd6chyvsgdcfl5kzx67crvgs1cqklx5say3426j57g4q"; 115 }); 116 foldl = appendPatch super.foldl (pkgs.fetchpatch { 117 url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; ··· 124 }); 125 stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { 126 url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; 127 + sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; 128 }); 129 mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { 130 url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";