diff options
author | Robert Djubek <envy1988@gmail.com> | 2020-03-31 15:44:25 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2020-04-03 22:00:28 +0200 |
commit | 3604904426394730fc6b47ef9480597532f63c1f (patch) | |
tree | d62e51c6be2d85224920124af6589460f5d64bff /pkgs/development | |
parent | 8296679c4b751d40e49e241e1177124220101675 (diff) | |
download | nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar.gz nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar.bz2 nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar.lz nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar.xz nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.tar.zst nixpkgs-3604904426394730fc6b47ef9480597532f63c1f.zip |
matterhorn: fix build
also fixes mattermost-api, mattermost-api-qc, and adds them to stewardship by kiwi
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 12 | ||||
-rw-r--r-- | pkgs/development/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 1d48598ba7c..e34126053df 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 2461a1ed21c..06d3f04b24a 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 |