diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock index 361d2c28..5e91a8c8 100644 --- a/dotfiles/config/taffybar/flake.lock +++ b/dotfiles/config/taffybar/flake.lock @@ -310,17 +310,18 @@ ] }, "locked": { - "lastModified": 1764319014, - "narHash": "sha256-OM69cuN5IIIkEy7UUDSsgkwzIvOnWvzYm/F1+ptpMjA=", - "ref": "refs/heads/bump-flake-dependencies", - "rev": "a7a7e620da2d9b51a6b841bbaf763ac1313e7d4e", - "revCount": 1617, - "type": "git", - "url": "file:./taffybar" + "lastModified": 1760591109, + "narHash": "sha256-O21ayp5v2eccXdcwNjTK5ZB99ruK0Zt9CUaw5Rye42g=", + "owner": "taffybar", + "repo": "taffybar", + "rev": "b256a711416036ca124fc9b3f89e7c957535e465", + "type": "github" }, "original": { - "type": "git", - "url": "file:./taffybar" + "owner": "taffybar", + "ref": "master", + "repo": "taffybar", + "type": "github" } }, "unstable": { diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 0a876ee2..2c2e7d03 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -4,7 +4,7 @@ nixpkgs.url = "github:colonelpanic8/nixpkgs/remove-gi-gtk-hs-patch"; xmonad.url = "github:xmonad/xmonad/master"; taffybar = { - url = "git+file:./taffybar"; + url = "github:taffybar/taffybar/master"; inputs.nixpkgs.follows = "nixpkgs"; inputs.xmonad.follows = "xmonad"; }; @@ -12,30 +12,19 @@ outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }: let hoverlay = final: prev: hself: hsuper: - let - fixGiVersionPackage = drv: - let - overridden = drv.override { - gi-gtk = hself.gi-gtk3; - gi-gdk = hself.gi-gdk3; - }; - in prev.haskell.lib.overrideCabal overridden (oa: { - postPatch = (oa.postPatch or "") + '' - substituteInPlace ${oa.pname}.cabal \ - --replace-fail "gi-gtk " "gi-gtk3 " \ - --replace-fail "gi-gdk " "gi-gdk3 " - ''; - }); - in { - taffybar = hsuper.taffybar.overrideAttrs (_: { + { + taffybar = prev.haskell.lib.overrideCabal hsuper.taffybar (oa: { doHaddock = false; doCheck = false; + # Fix for GHC 9.4 where liftA2 is not in Prelude + postPatch = (oa.postPatch or "") + '' + substituteInPlace src/System/Taffybar/DBus/Client/Util.hs \ + --replace-fail "import Control.Monad (forM)" \ + "import Control.Monad (forM) +import Control.Applicative (liftA2)" + ''; }); - gi-gtk-hs = - let drv = hsuper.gi-gtk-hs; - in if final.lib.versionOlder drv.version "0.3.18" - then fixGiVersionPackage drv - else drv; + # gi-gtk-hs patching is now handled by taffybar's fixVersionNamePackages overlay imalison-taffybar = prev.haskell.lib.addPkgconfigDepends ( hself.callCabal2nix "imalison-taffybar" (