haskell: move patches to patches directory

This commit is contained in:
obadz 2015-08-05 20:48:18 +01:00
parent 23f5a23ec7
commit 3801ef5912
12 changed files with 6 additions and 6 deletions

View File

@ -561,7 +561,7 @@ self: super: {
duplo = dontCheck super.duplo; duplo = dontCheck super.duplo;
# Nix-specific workaround # Nix-specific workaround
xmonad = appendPatch super.xmonad ./xmonad-nix.patch; xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch;
# https://github.com/evanrinehart/mikmod/issues/1 # https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
@ -633,7 +633,7 @@ self: super: {
# wxc needs help deciding which version of GTK to use. # wxc needs help deciding which version of GTK to use.
wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: { wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
patches = [ ./wxc-no-ldconfig.patch ]; patches = [ ./patches/wxc-no-ldconfig.patch ];
doHaddock = false; doHaddock = false;
postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so"; postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
}); });
@ -783,7 +783,7 @@ self: super: {
leksah = dontCheck super.leksah; leksah = dontCheck super.leksah;
# Patch to consider NIX_GHC just like xmonad does # Patch to consider NIX_GHC just like xmonad does
dyre = appendPatch super.dyre ./dyre-nix.patch; dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
# Test suite won't compile against tasty-hunit 0.9.x. # Test suite won't compile against tasty-hunit 0.9.x.
zlib = dontCheck super.zlib; zlib = dontCheck super.zlib;

View File

@ -205,7 +205,7 @@ self: super: {
tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts"); tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
# http://hub.darcs.net/ivanm/graphviz/issue/5 # http://hub.darcs.net/ivanm/graphviz/issue/5
graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch)); graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
# Broken with GHC 7.10.x. # Broken with GHC 7.10.x.
aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;

View File

@ -87,7 +87,7 @@ self: super: {
}); });
ghc-paths = overrideCabal super.ghc-paths (drv: { ghc-paths = overrideCabal super.ghc-paths (drv: {
patches = [ ./ghc-paths-nix-ghcjs.patch ]; patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
}); });
reflex-dom = overrideCabal super.reflex-dom (drv: { reflex-dom = overrideCabal super.reflex-dom (drv: {

View File

@ -53993,7 +53993,7 @@ self: {
version = "0.1.0.9"; version = "0.1.0.9";
sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
buildDepends = [ base ]; buildDepends = [ base ];
patches = [ ./ghc-paths-nix.patch ]; patches = [ ./patches/ghc-paths-nix.patch ];
description = "Knowledge of GHC's installation directories"; description = "Knowledge of GHC's installation directories";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};