diff options
| author | Robert Djubek <envy1988@gmail.com> | 2020-01-19 14:20:30 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-01-24 21:02:42 +0100 |
| commit | bb3a93fdb5c8def0b7f91803595a0f13a354ca05 (patch) | |
| tree | ff66e5758e48ea3f9ebe62e4cf72bd73dcd5ec18 /pkgs/development | |
| parent | 8e5d5bac2ec91fa4c019bb8d686373c90a1b1830 (diff) | |
| download | nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar.gz nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar.bz2 nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar.lz nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar.xz nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.tar.zst nixpkgs-bb3a93fdb5c8def0b7f91803595a0f13a354ca05.zip | |
matterhorn: init at 50200.6.0
Command line mattermost client
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 | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8d7d2fbfd8f..7596215f96d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1347,6 +1347,18 @@ self: super: { regex-base = self.regex-base_0_94_0_0; }); + # 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 + matterhorn = doJailbreak (super.matterhorn.override { + brick-skylighting = self.brick-skylighting.override { + brick = self.brick_0_50_1; + }; + }); + + # 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi + Unique = doJailbreak super.Unique; + # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream snap-server = overrideCabal super.snap-server (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b4e17dd59c8..5eddabd8934 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2603,6 +2603,8 @@ package-maintainers: - streaming-wai kiwi: - glirc + - matterhorn + - Unique psibi: - path-pieces - persistent @@ -7173,7 +7175,6 @@ broken-packages: - mathlink - matrix-as-xyz - matsuri - - matterhorn - maude - maxent - maxent-learner-hw @@ -9929,7 +9930,6 @@ broken-packages: - uniform-io - union - union-map - - Unique - uniqueid - uniquely-represented-sets - units-attoparsec |