From 9c5664170e72fd5892097e6a1df8e9d290c4c862 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 26 Nov 2021 19:27:42 +0100
Subject: [PATCH] Update kassandra for taskwarrior compat

---
 overlays/kassandra/default.nix  | 11 +++++++++++
 overlays/kassandra2/default.nix |  8 --------
 overlays/pkgSets.nix            |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 overlays/kassandra/default.nix
 delete mode 100644 overlays/kassandra2/default.nix

diff --git a/overlays/kassandra/default.nix b/overlays/kassandra/default.nix
new file mode 100644
index 00000000..175d623f
--- /dev/null
+++ b/overlays/kassandra/default.nix
@@ -0,0 +1,11 @@
+final: prev:
+let
+  haskellPackages = prev.haskellPackages.extend (self: super: {
+    kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") { };
+    standalone = self.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { };
+    taskwarrior = self.callHackageDirect { pkg = "taskwarrior"; ver = "0.3.1.0"; sha256 = "sha256-XUoa+xWUHfr080za07/4Xxcic6jgfljrTIXbLaXzoqQ="; } { };
+  });
+in
+{
+  kassandra = haskellPackages.standalone;
+}
diff --git a/overlays/kassandra2/default.nix b/overlays/kassandra2/default.nix
deleted file mode 100644
index c69fa03d..00000000
--- a/overlays/kassandra2/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-final: prev:
-let
-  kassandra = prev.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") { };
-  standalone = prev.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
-in
-{
-  kassandra2 = standalone;
-}
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 73ff1349..be810bf7 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -37,7 +37,7 @@ self: super: {
     '';
   };
   desktop-pkgs = {
-    inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra2 shotcut mlt audacity paprefs wl-clipboard
+    inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra shotcut mlt audacity paprefs wl-clipboard
       nheko dconf2nix haskell-docs-cli
       ;
     inherit (self.gnomeExtensions) appindicator system-monitor