From aa34feebd84e5833547f5225334a4540eb0701e7 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 23 May 2021 14:02:16 +1000 Subject: [PATCH] haskellPackages.taffybar: override src until next Hackage update Taffybar 3.2.5 fixes dyre compatibility, but is not in Hackage as of 2021-05-19T07:17:55Z. --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9b25b1767880..c09448e77391 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1954,4 +1954,19 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # 2021-05-23: Override for a quite recent Hackage release. + taffybar = + if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5" + then throw "Drop src override for taffybar >= 3.2.5" + else overrideCabal super.taffybar (drv: { + src = pkgs.fetchFromGitHub { + owner = "taffybar"; + repo = "taffybar"; + rev = "91c83e01e131d560e704b12f0d798905e4289a3d"; + sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr"; + }; + version = "3.2.5"; + editedCabalFile = null; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super