From e14278d33be7a1b496d237cce746ab16eb1750f6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 28 Mar 2022 18:31:01 +0200 Subject: [PATCH] yi: build using GHC 8.10.7 Luckily, all build failures where just related to type checking changes in GHC 9.0 (and maybe base changes?), so we can just use GHC 8.10.7 with the Stackage version of packages and keep Yi working. I feel like we dodged a bullet here, as upstream maintenance doesn't seem to be too proactive these days. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 466db68e2497..097946690447 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -111,6 +111,9 @@ self: super: { ghc-prim = self.hashable; }; + # Doesn't build with 9.0, see https://github.com/yi-editor/yi/issues/1125 + yi-core = doDistribute (markUnbroken super.yi-core); + # Temporarily disabled blaze-textual for GHC >= 9.0 causing hackage2nix ignoring it # https://github.com/paul-rouse/mysql-simple/blob/872604f87044ff6d1a240d9819a16c2bdf4ed8f5/Database/MySQL/Internal/Blaze.hs#L4-L10 mysql-simple = addBuildDepends [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2075d14826ae..aefa4d2fe484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11579,7 +11579,9 @@ with pkgs; yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. - yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yi = callPackage ../applications/editors/yi/wrapper.nix { + haskellPackages = haskell.packages.ghc8107; + }; yj = callPackage ../development/tools/yj { };