diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 60 |
1 files changed, 45 insertions, 15 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b06628dbc7..64a15e39689 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -74,7 +74,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1i4arhwbc05iz8hl7kk843m2f49i3ysby1kxcm9qfhpk7z9nyzj4"; + sha256 = "0s8sv6h90l2a9xdabj0nirhpr6d2k8s5cddjdkm50x395i014w31"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -1052,17 +1052,17 @@ self: super: { # This raises the lower bound on prettyprinter to 1.5.1 since # `removeTrailingWhitespace` is buggy in earlier versions. # This will probably be able to be removed when we update to LTS-15. - dhall_1_28_0 = - dontCheck (super.dhall_1_28_0.override { - prettyprinter = self.prettyprinter_1_5_1; + dhall_1_29_0 = + dontCheck (super.dhall_1_29_0.override { + prettyprinter = self.prettyprinter_1_6_0; prettyprinter-ansi-terminal = self.prettyprinter-ansi-terminal.override { - prettyprinter = self.prettyprinter_1_5_1; + prettyprinter = self.prettyprinter_1_6_0; }; }); - dhall-bash_1_0_25 = super.dhall-bash_1_0_25.override { dhall = self.dhall_1_28_0; }; - dhall-json_1_6_0 = super.dhall-json_1_6_0.override { - dhall = self.dhall_1_28_0; + dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; }; + dhall-json_1_6_1 = super.dhall-json_1_6_1.override { + dhall = self.dhall_1_29_0; prettyprinter = self.prettyprinter_1_5_1; prettyprinter-ansi-terminal = self.prettyprinter-ansi-terminal.override { @@ -1228,8 +1228,7 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_28_0; }; - dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_28_0; }; + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_29_0; }; # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 @@ -1238,8 +1237,8 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # need newer version of ghc-libparser - hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204; }; + # Use a matching version of ghc-lib-parser. + ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; }; # https://github.com/sol/hpack/issues/366 hpack = self.hpack_0_33_0; @@ -1261,7 +1260,7 @@ self: super: { # The LTS-14.x version of their dependencies are too old. cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_0; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; }); - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_23_0; }; # Version bounds for http-client are too strict: # https://github.com/bitnomial/prometheus/issues/34 @@ -1325,7 +1324,7 @@ self: super: { }); # Needs the corresponding version of haskell-src-exts. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_23_0; }; # https://github.com/Daniel-Diaz/HaTeX/issues/144 HaTeX = dontCheck super.HaTeX; @@ -1338,7 +1337,27 @@ self: super: { # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi - glirc = doJailbreak super.glirc; + # 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base + + glirc = doJailbreak (super.glirc.override { + regex-tdfa = self.regex-tdfa_1_3_1_0; + }); + + regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override { + regex-base = self.regex-base_0_94_0_0; + }); + + # 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting; + # multiple versions of them were being pulled in by the others which is not allowed. + # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi + matterhorn = doJailbreak (super.matterhorn.override { + brick-skylighting = self.brick-skylighting.override { + brick = self.brick_0_50_1; + }; + }); + + # 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi + Unique = doJailbreak super.Unique; # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream @@ -1361,4 +1380,15 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; + # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0) + ormolu = doJailbreak (super.ormolu.override { + ghc-lib-parser = self.ghc-lib-parser_8_8_2; + }); + + # krank-0.1.0 does not accept PyF-0.9.0.0. + krank = doJailbreak super.krank; + + # prettyprinter-1.6.0 fails its doctest suite. + prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super |