From 3604904426394730fc6b47ef9480597532f63c1f Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 31 Mar 2020 15:44:25 +0000 Subject: [PATCH] matterhorn: fix build also fixes mattermost-api, mattermost-api-qc, and adds them to stewardship by kiwi --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1d48598ba7c8..e34126053df2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1463,6 +1463,18 @@ self: super: { # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; + # 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 + # 2020-03-31 - "..." it broke again. so here's a more complicated way -- kiwi + matterhorn = super.matterhorn.override { + brick-skylighting = self.brick-skylighting.override { + brick = self.brick_0_52_1.override { + vty = self.vty_5_28_2; + }; + }; + }; + persistent-mysql = dontCheck super.persistent-mysql; # Fix EdisonAPI and EdisonCore for GHC 8.8: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2461a1ed21cb..06d3f04b24ac 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2459,6 +2459,9 @@ package-maintainers: - streaming-wai kiwi: # - glirc + - matterhorn + - mattermost-api + - mattermost-api-qc - Unique psibi: - path-pieces @@ -7329,9 +7332,6 @@ broken-packages: - matrix-as-xyz - matrix-market - matsuri - - matterhorn - - mattermost-api - - mattermost-api-qc - maude - maxent - maxent-learner-hw