diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6cff2e9d3c5..fdebcef16fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -6,7 +6,7 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; - Cabal_1_20_0_3 = doJailbreak (dontCheck super.Cabal_1_20_0_3); + Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; Cabal_1_22_0_0 = dontCheck super.Cabal_1_22_0_0; cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_0_0; }); @@ -31,10 +31,6 @@ self: super: { elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; }; elm-package = super.elm-package.override { optparse-applicative = self.optparse-applicative_0_10_0; }; - # elm-compiler jail-break can be removed after next elm-compiler - # release: bumped language-ecmascript's limit in git already. - elm-compiler = doJailbreak super.elm-compiler; - # https://github.com/acid-state/safecopy/issues/17 safecopy = dontCheck super.safecopy; @@ -62,27 +58,12 @@ self: super: { # https://github.com/haskell/time/issues/23 time_1_5_0_1 = dontCheck super.time_1_5_0_1; - # Won't accept recent random: https://bitbucket.org/dafis/arithmoi/issue/14/outdated-dependency-on-random. - arithmoi = doJailbreak super.arithmoi; - # Doesn't accept modern versions of hashtable. - Agda = dontHaddock (doJailbreak super.Agda); + Agda = dontHaddock super.Agda; # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10. network-uri = dontCheck super.network-uri; - # 0.7.0.2 doesn't accept recent versions of HaXml. - encoding = doJailbreak super.encoding; - - # Doesn't accept recent versions of vector-space. - active = doJailbreak super.active; - diagrams-core = doJailbreak super.diagrams-core; # https://github.com/diagrams/diagrams-core/issues/78 - diagrams-contrib = doJailbreak super.diagrams-contrib; - diagrams-lib = doJailbreak super.diagrams-lib; - diagrams-svg = doJailbreak super.diagrams-svg; - force-layout = doJailbreak super.force-layout; - vector-space-points = doJailbreak super.vector-space-points; - # The Haddock phase fails for one reason or another. attoparsec-conduit = dontHaddock super.attoparsec-conduit; blaze-builder-conduit = dontHaddock super.blaze-builder-conduit; @@ -118,9 +99,6 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; - # https://github.com/gcross/AbortT-transformers/issues/1 - AbortT-transformers = doJailbreak super.AbortT-transformers; - # Depends on broken NewBinary package. ASN1 = markBroken super.ASN1; @@ -137,14 +115,14 @@ self: super: { hbro-contrib = markBroken super.hbro-contrib; # https://github.com/prowdsponsor/fb/pull/33 - fb = doJailbreak (overrideCabal super.fb (drv: { + fb = overrideCabal super.fb (drv: { patches = [ (pkgs.fetchpatch { url = https://github.com/prowdsponsor/fb/pull/31.patch; sha256 = "0ip8mhpbbvlp4pz7d27d6cg39gm6ypfsf4rdmfrmdh3pkig0axls"; }) ]; - })); + }); # https://github.com/haskell/vector/issues/47 vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;