From ddfc4ba977f9a3a706e9bdcd573a10f6091220e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Jul 2016 12:49:40 +0200 Subject: [PATCH] haskell-Glob: fix LTS build --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 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 4131e33234b2..ab8a091aabe8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -63,9 +63,6 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; - # requires filepath >=1.1 && <1.4 - Glob = doJailbreak super.Glob; - # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; @@ -211,6 +208,8 @@ self: super: { semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); + Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); + Glob = addBuildDepends super.Glob (with self; [semigroups]); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };