From 111937ba585679e0cf901885e8c3fca8ae301c8f Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Wed, 27 May 2020 11:16:20 +0200 Subject: [PATCH] allow aeson 1.5 & these 1.1 (#595) aeson 1.5.1 depends on these 1.1, so allowing a newer version is necessary to prevent a conflict. " I saw in https://github.com/haskell-nix/hnix/issues/551#issuecomment-633953865 that a bump of aeson was wished before the 0.7.2 release would be cut, so here it is. At a glance, there don't seem to be any relevant changes: https://hackage.haskell.org/package/aeson-1.5.0.0/changelog https://github.com/bos/aeson/compare/1.4.7.1-r1...1.5.0.0 But 1.5.1 requires a bump to these to avoid diamond dependencies. Changes also seem irrelevant and just related to the change in aeson: https://hackage.haskell.org/package/these-1.1/changelog https://github.com/isomorphism/these/compare/v1...v1.1 (most changes here are in other packages in the same repository) These changes compile fine and tests are successful with GHC 8.8.3. " --- hnix.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hnix.cabal b/hnix.cabal index 885f257..4292310 100644 --- a/hnix.cabal +++ b/hnix.cabal @@ -850,7 +850,7 @@ library src ghc-options: -Wall -fprint-potential-instances build-depends: - aeson >= 1.4.2 && < 1.5 + aeson >= 1.4.2 && < 1.6 , array >=0.4 && <0.6 , base >=4.11 && <5 , binary >= 0.8.5 && < 0.9 @@ -895,7 +895,7 @@ library , syb >= 0.7 && < 0.8 , template-haskell , text >= 1.2.3 && < 1.3 - , these >= 1.0.1 && < 1.1 + , these >= 1.0.1 && < 1.2 , time >= 1.8.0 && < 1.9 || >= 1.9.3 && < 1.10 , transformers >= 0.5.5 && < 0.6 , transformers-base >= 0.4.5 && < 0.5