From 6da02123602069ced56d0c733658a4fd509b6964 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 28 Mar 2022 13:10:21 +0200 Subject: [PATCH] taffybar: build using GHC 8.10.7 taffybar's GHC 9.0 patches are unreleased and not easy to backport. --- .../haskell-modules/configuration-ghc-8.10.x.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 dc480666ba6f..466db68e2497 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -116,4 +116,6 @@ self: super: { mysql-simple = addBuildDepends [ self.blaze-textual ] super.mysql-simple; + + taffybar = markUnbroken (doDistribute super.taffybar); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 046766fa6223..2075d14826ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29412,8 +29412,10 @@ with pkgs; # customConfig = builtins.readFile ./tabbed.config.h; }; - taffybar = callPackage ../applications/window-managers/taffybar { - inherit (haskellPackages) ghcWithPackages taffybar; + # Use GHC 9.0 when this asserts starts to fire + taffybar = assert haskellPackages.taffybar.version == "3.3.0"; + callPackage ../applications/window-managers/taffybar { + inherit (haskell.packages.ghc8107) ghcWithPackages taffybar; }; tagainijisho = callPackage ../applications/office/tagainijisho {};