From f076ff3503c9ebe408bfb48c34db139b3b051ee8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 2 Feb 2021 17:42:20 +0900 Subject: [PATCH] spago: fix build by specifying older version of dhall --- .../haskell-modules/configuration-hackage2nix.yaml | 3 ++- pkgs/development/haskell-modules/configuration-nix.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a19b005d52c..2a48989ab15 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2694,7 +2694,8 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - dhall == 1.29.0 # required for spago 0.14.0. + - dhall == 1.29.0 # required for ats-pkg + - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 06578f56535..657c04b0d81 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super { let # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; + spagoWithOverrides = doJailbreak (super.spago.override { + dhall = self.dhall_1_37_1; + }); # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source.