diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e32ccfa17939..20e228a43657 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -858,9 +858,6 @@ self: super: { fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 - stack2nix = doJailbreak super.stack2nix; - # Work around https://github.com/haskell/c2hs/issues/192. c2hs = dontCheck super.c2hs; @@ -954,12 +951,6 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; - # Support ansi-terminal 0.7.x. - cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { - url = "https://github.com/haskell-hvr/cabal-plan/pull/16.patch"; - sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l"; - }); - # https://github.com/simonmichael/hledger/issues/852 hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch { url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch"; @@ -1080,19 +1071,18 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); + # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. + # Lets remove this once the LTS has upraded to 0.29.6. + hpack = super.hpack_0_29_6; + cabal2nix = - let - # The test suite does not know how to find the 'cabal2nix' binary. - drv1 = overrideCabal super.cabal2nix (drv: { - preCheck = '' - export PATH="$PWD/dist/build/cabal2nix:$PATH" - export HOME="$TMPDIR/home" - ''; - }); - # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. - # Lets remove this once the LTS has upraded to 0.29.6. - drv2 = drv1.override { hpack = self.hpack_0_29_6; }; - in drv2; + # The test suite does not know how to find the 'cabal2nix' binary. + overrideCabal super.cabal2nix (drv: { + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; @@ -1129,4 +1119,7 @@ self: super: { # Can be removed once yi-language >= 0.18 is in the LTS yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; }; -} + + # https://github.com/MarcWeber/hasktags/issues/52 + hasktags = dontCheck super.hasktags; +} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |