summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorobadz <dav-github@odav.org>2015-08-05 20:48:18 +0100
committerobadz <dav-github@odav.org>2015-08-06 11:14:05 +0100
commit3801ef59127330d30f98ff3af3e04e7ac790722e (patch)
tree1085c539bb6dd90ace1536ac2e8a516b9a4d64ab /pkgs/development/haskell-modules
parent23f5a23ec7251a54918d00aa996bfffcb6b72d3b (diff)
downloadnixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar.gz
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar.bz2
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar.lz
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar.xz
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.tar.zst
nixlib-3801ef59127330d30f98ff3af3e04e7ac790722e.zip
haskell: move patches to patches directory
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix6
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix2
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2
-rw-r--r--pkgs/development/haskell-modules/patches/dyre-nix.patch (renamed from pkgs/development/haskell-modules/dyre-nix.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch (renamed from pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch (renamed from pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/ghc-paths-nix.patch (renamed from pkgs/development/haskell-modules/ghc-paths-nix.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch (renamed from pkgs/development/haskell-modules/graphviz-fix-ghc710.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch (renamed from pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch (renamed from pkgs/development/haskell-modules/wxc-no-ldconfig.patch)0
-rw-r--r--pkgs/development/haskell-modules/patches/xmonad-nix.patch (renamed from pkgs/development/haskell-modules/xmonad-nix.patch)0
12 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f0b5d4599a0..5e412dab8d46 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -561,7 +561,7 @@ self: super: {
   duplo = dontCheck super.duplo;
 
   # 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
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
@@ -633,7 +633,7 @@ self: super: {
 
   # wxc needs help deciding which version of GTK to use.
   wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
-    patches = [ ./wxc-no-ldconfig.patch ];
+    patches = [ ./patches/wxc-no-ldconfig.patch ];
     doHaddock = false;
     postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
   });
@@ -783,7 +783,7 @@ self: super: {
   leksah = dontCheck super.leksah;
 
   # 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.
   zlib = dontCheck super.zlib;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index e9f2219f07e4..cd06bf0f2645 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -205,7 +205,7 @@ self: super: {
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
   # 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.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6fbb28d026ee..1e56981fe8f3 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -87,7 +87,7 @@ self: super: {
   });
 
   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: {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b6a18d7653c2..0c02cdec9b0a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -53993,7 +53993,7 @@ self: {
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
        buildDepends = [ base ];
-       patches = [ ./ghc-paths-nix.patch ];
+       patches = [ ./patches/ghc-paths-nix.patch ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
diff --git a/pkgs/development/haskell-modules/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch
index 458e540e0c4a..458e540e0c4a 100644
--- a/pkgs/development/haskell-modules/dyre-nix.patch
+++ b/pkgs/development/haskell-modules/patches/dyre-nix.patch
diff --git a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
index ec88c65f8bc0..ec88c65f8bc0 100644
--- a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
+++ b/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
index 26ea0eaa5a8b..26ea0eaa5a8b 100644
--- a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
+++ b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
index b3c75a26a035..b3c75a26a035 100644
--- a/pkgs/development/haskell-modules/ghc-paths-nix.patch
+++ b/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
index e72bb793da73..e72bb793da73 100644
--- a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
+++ b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
diff --git a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
index c3df98043b3b..c3df98043b3b 100644
--- a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch
+++ b/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
diff --git a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
index 72a8648cab67..72a8648cab67 100644
--- a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch
+++ b/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
diff --git a/pkgs/development/haskell-modules/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
index 810d8435a343..810d8435a343 100644
--- a/pkgs/development/haskell-modules/xmonad-nix.patch
+++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch