From 3f30c971c8d65312cf0a1a18a8a804621eaae967 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 04:16:43 +0800
Subject: [PATCH 1/2] Add haskell package 'taffybar'

---
 pkgs/applications/misc/taffybar/default.nix | 25 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix         |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/misc/taffybar/default.nix

diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix
new file mode 100644
index 000000000000..a92e7e32f048
--- /dev/null
+++ b/pkgs/applications/misc/taffybar/default.nix
@@ -0,0 +1,25 @@
+{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
+, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
+, time, transformers, utf8String, X11, xdgBasedir, xmonad
+, xmonadContrib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "taffybar";
+  version = "0.3.0";
+  sha256 = "02vpfbwfprca997ykk746ih7id0ls3i5pnb33gj3nrfgc59fkz7v";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cairo dbus dyre filepath gtk gtkTraymanager HStringTemplate HTTP
+    mtl network parsec split stm text time transformers utf8String X11
+    xdgBasedir xmonad xmonadContrib
+  ];
+  pkgconfigDepends = [ gtk ];
+  meta = {
+    homepage = "http://github.com/travitch/taffybar";
+    description = "A desktop bar similar to xmobar, but with more GUI";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a599b48f0650..1cf642539e9b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2769,6 +2769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     QuickCheck = self.QuickCheck2;
   };
 
+  taffybar = callPackage ../applications/misc/taffybar {};
+
   yi = callPackage ../applications/editors/yi/yi.nix {};
 
   yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {};

From 807d01debd4d81b028c1b62de72c3f6a934b5d49 Mon Sep 17 00:00:00 2001
From: PkmX <pkmx.tw@gmail.com>
Date: Sun, 9 Feb 2014 04:09:04 +0800
Subject: [PATCH 2/2] Add Haskell package 'gtk-traymanager'

---
 .../libraries/haskell/gtk-traymanager/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/gtk-traymanager/default.nix

diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
new file mode 100644
index 000000000000..8d319ee246ec
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -0,0 +1,15 @@
+{ cabal, glib, gtk, X11 }:
+
+cabal.mkDerivation (self: {
+  pname = "gtk-traymanager";
+  version = "0.1.3";
+  sha256 = "07671f3j3r07djgvrlpbdaqqnm2yc7sc5f5isjn5nczrwh8n0sj4";
+  buildDepends = [ glib gtk ];
+  pkgconfigDepends = [ gtk X11 ];
+  meta = {
+    homepage = "http://github.com/travitch/gtk-traymanager";
+    description = "A wrapper around the eggtraymanager library for Linux system trays";
+    license = self.stdenv.lib.licenses.lgpl21;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1cf642539e9b..7bf78003777b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1216,6 +1216,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libc = pkgs.stdenv.gcc.libc;
   };
 
+  gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {};
+
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
   groups = callPackage ../development/libraries/haskell/groups {};