diff options
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch | 30 |
2 files changed, 37 insertions, 0 deletions
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 f1458be845a..cf896f6ad8b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -321,4 +321,11 @@ self: super: { # Sent e-mail to the maintainer. IOSpec = appendPatch super.IOSpec ./IOSpec-fix-ghc710.patch; + # Updated Cabal file from Hackage tightened version bounds for some reason. + edit-distance = let pkg = appendPatch super.edit-distance ./edit-distance-fix-boundaries.patch; + in appendPatch pkg (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/batterseapower/edit-distance/pull/3.patch"; + sha256 = "013x9za47vr9jx0liwgi8cdh2h2882a87h5nqvr41xqipzxfiyw1"; + }); + } diff --git a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch new file mode 100644 index 00000000000..ec88c65f8bc --- /dev/null +++ b/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch @@ -0,0 +1,30 @@ +diff -ru3 edit-distance-0.2.1.2-old/edit-distance.cabal edit-distance-0.2.1.2/edit-distance.cabal +--- edit-distance-0.2.1.2-old/edit-distance.cabal 2015-04-17 22:46:50.964116064 +0300 ++++ edit-distance-0.2.1.2/edit-distance.cabal 2015-04-17 22:41:31.216027373 +0300 +@@ -36,7 +36,7 @@ + Text.EditDistance.ArrayUtilities + + if flag(splitBase) +- Build-Depends: base >= 3 && < 4.8, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 ++ Build-Depends: base >= 3 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 + else + Build-Depends: base < 3 + +@@ -54,7 +54,7 @@ + else + Build-Depends: test-framework >= 0.1.1, QuickCheck >= 1.1 && < 2.0, test-framework-quickcheck + if flag(splitBase) +- Build-Depends: base >= 3 && < 4.8, array >= 0.1, random >= 1.0 ++ Build-Depends: base >= 3 && < 5, array >= 0.1, random >= 1.0 + else + Build-Depends: base < 3 + +@@ -65,7 +65,7 @@ + Buildable: False + else + if flag(splitBase) +- Build-Depends: base >= 3 && < 4.8, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, ++ Build-Depends: base >= 3 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, + deepseq >= 1.2, unix >= 2.3, criterion >= 0.6 + else + Build-Depends: base < 3, |