nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patches for a lot of packages for GHC 7.10

Browse Source
This commit is contained in:
Joel Taylor 2015-02-22 17:31:28 -08:00
parent cda356a8f8
commit 8bfa1a2efc
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/fetchpatch/default.nix
View File

@ -19,4 +19,4 @@ fetchurl ({
--clean "$out" > "$tmpfile" --clean "$out" > "$tmpfile"
mv "$tmpfile" "$out" mv "$tmpfile" "$out"
''; '';
} // args) } // builtins.removeAttrs args ["stripLen"])

47
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -58,6 +58,7 @@ self: super: {
utf8-string = overrideCabal super.utf8-string (drv: { utf8-string = overrideCabal super.utf8-string (drv: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
}); });
esqueleto = doJailbreak super.esqueleto;
# bos/attoparsec#92 # bos/attoparsec#92
attoparsec = dontCheck super.attoparsec; attoparsec = dontCheck super.attoparsec;
@ -84,4 +85,50 @@ self: super: {
barecheck = doJailbreak super.barecheck; barecheck = doJailbreak super.barecheck;
cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; });
# https://github.com/kazu-yamamoto/unix-time/issues/30
unix-time = dontCheck super.unix-time;
# https://github.com/peti/jailbreak-cabal/issues/5
ReadArgs = dontCheck super.ReadArgs;
# Until the changes have been pushed to Hackage
haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch {
url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch";
sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w";
});
foldl = appendPatch super.foldl (pkgs.fetchpatch {
url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch";
sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl";
});
shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
url = "https://github.com/yesodweb/shakespeare/pull/151.patch";
sha256 = "1lb8x89jmvmd73rxkw68a3arbp5nyjiz28i78sz8idh7vcisxb7l";
});
persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";
sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw";
stripLen = 1;
});
stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch {
url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch";
sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g";
});
mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
});
conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch {
url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
});
wai-extra = appendPatch super.wai-extra (pkgs.fetchpatch {
url = "https://github.com/yesodweb/wai/pull/339.patch";
sha256 = "1rmz1ijfch143v7jg4d5r50lqq9r46zhcmdafq8p9g9pjxlyc590";
stripLen = 1;
});
yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
url = "https://github.com/yesodweb/yesod/pull/941.patch";
sha256 = "1fycvjfr1l9wa03k30bnppl3ns99lffh9kmp9r7sr8b6yiydcajq";
stripLen = 1;
});
} }

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -237,7 +237,7 @@ stdenv.mkDerivation ({
mv $packageConfFile $packageConfDir/$pkgId.conf mv $packageConfFile $packageConfDir/$pkgId.conf
''} ''}
${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin) '' ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
for exe in "$out/bin/"* ; do for exe in "$out/bin/"* ; do
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
done done