From b1179bdbcff0df8f3b8220589d8c8dd72dae8bd5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Fri, 18 Mar 2016 23:05:04 +0300 Subject: [PATCH] haskellPackages.Agda: use older cpphs Package requires cpphs < 0.20.0. --- .../haskell-modules/configuration-common.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e0a02c0f2d0..b5b4db7e7297 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -941,9 +941,18 @@ self: super: { language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; # https://github.com/agda/agda/issues/1840 - Agda_2_4_2_3 = super.Agda_2_4_2_3.override { unordered-containers = self.unordered-containers_0_2_5_1; }; - Agda_2_4_2_4 = super.Agda_2_4_2_4.override { unordered-containers = self.unordered-containers_0_2_5_1; }; - Agda = super.Agda.override { unordered-containers = self.unordered-containers_0_2_5_1; }; + Agda_2_4_2_3 = super.Agda_2_4_2_3.override { + unordered-containers = self.unordered-containers_0_2_5_1; + cpphs = self.cpphs_1_19_3; + }; + Agda_2_4_2_4 = super.Agda_2_4_2_4.override { + unordered-containers = self.unordered-containers_0_2_5_1; + cpphs = self.cpphs_1_19_3; + }; + Agda = super.Agda.override { + unordered-containers = self.unordered-containers_0_2_5_1; + cpphs = self.cpphs_1_19_3; + }; # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle;