From a0388f8e900f41cdf6246a0a4581939270192c29 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 17 Jun 2019 01:00:33 -0700
Subject: [PATCH] [taffybar] Use newer version of haskell-gi

---
 dotfiles/config/taffybar/default.nix |  2 +-
 dotfiles/config/taffybar/shell.nix   |  2 +-
 dotfiles/config/taffybar/stack.yaml  | 24 +++++++++++++-----------
 dotfiles/config/taffybar/taffybar    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/dotfiles/config/taffybar/default.nix b/dotfiles/config/taffybar/default.nix
index c743547c..47cd42ca 100644
--- a/dotfiles/config/taffybar/default.nix
+++ b/dotfiles/config/taffybar/default.nix
@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> { overlays = [
+  pkgs = (import ./taffybar/nixpkgs.nix) { overlays = [
     (import ./taffybar/overlay.nix) (import ../xmonad/overlay.nix)
   ]; };
   source = pkgs.lib.sourceByRegex ./. ["taffybar.hs" "imalison-taffybar.cabal"];
diff --git a/dotfiles/config/taffybar/shell.nix b/dotfiles/config/taffybar/shell.nix
index aae7a934..2c511610 100644
--- a/dotfiles/config/taffybar/shell.nix
+++ b/dotfiles/config/taffybar/shell.nix
@@ -1,5 +1,5 @@
 let
-  pkgs = import <nixpkgs> { overlays = [
+  pkgs = (import ./taffybar/nixpkgs.nix) { overlays = [
     (import ./taffybar/overlay.nix) (import ../xmonad/overlay.nix)
   ]; };
   source = pkgs.lib.sourceByRegex ./. ["taffybar.hs" "imalison-taffybar.cabal"];
diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml
index 0d823dfc..eb53d87a 100644
--- a/dotfiles/config/taffybar/stack.yaml
+++ b/dotfiles/config/taffybar/stack.yaml
@@ -19,24 +19,26 @@ extra-deps:
 - containers-0.5.11.0
 - dbus-1.2.1
 - dbus-hslogger-0.1.0.1
+- gi-atk-2.0.20
 - gi-cairo-connector-0.0.1
 - gi-cairo-render-0.0.1
-- gi-dbusmenu-0.4.1
-- gi-dbusmenugtk3-0.4.1
-- gi-gdk-3.0.15
-- gi-gdkpixbuf-2.0.18
+- gi-dbusmenu-0.4.6
+- gi-dbusmenugtk3-0.4.7
+- gi-gdk-3.0.21
+- gi-gdkpixbuf-2.0.22
 - gi-gdkx11-3.0.4
-- gi-gio-2.0.16
-- gi-glib-2.0.17
-- gi-gtk-3.0.26
-- gi-gtk-hs-0.3.6.3
-- gi-pango-1.0.16
+- gi-gio-2.0.24
+- gi-glib-2.0.22
+- gi-gobject-2.0.21
+- gi-gtk-3.0.31
+- gi-gtk-hs-0.3.7.0
+- gi-pango-1.0.21
 - gi-xlib-2.0.2
 - gio-0.13.4.1
 - gtk-sni-tray-0.1.6.0
 - gtk-strut-0.1.3.0
-- haskell-gi-0.21.2
-- haskell-gi-base-0.21.2
+- haskell-gi-0.22.5
+- haskell-gi-base-0.22.2
 - libxml-sax-0.7.5
 - rate-limit-1.4.1
 - spool-0.1
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index cb09a5d1..df8a12fc 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit cb09a5d1c5ee7af55c627175373fb1ea469d651e
+Subproject commit df8a12fc13c80b32fbb7dba6480c90cbb84b3407