From f9692318cb485809c8cb95b69a56e3eef49ee948 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 21 Sep 2020 10:39:56 +0200
Subject: [PATCH] Install kassandra2 via nix expression

---
 nix/sources.json                | 6 ++++++
 overlays/kassandra2/default.nix | 7 +++++++
 overlays/pkgSets.nix            | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 overlays/kassandra2/default.nix

diff --git a/nix/sources.json b/nix/sources.json
index 2037ed06..9884956a 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -17,6 +17,12 @@
         "rev": "1a0d19ce5d384e15ca64f7f043e5817cbaaf9f6d",
         "type": "git"
     },
+    "kassandra2": {
+        "ref": "master",
+        "repo": "git@hera.m-0.eu:kassandra2",
+        "rev": "2590f2dfa35b6a5a22993c5a79c50a8596febf5d",
+        "type": "git"
+    },
     "nixos-hardware": {
         "branch": "master",
         "description": "A collection of NixOS modules covering hardware quirks.",
diff --git a/overlays/kassandra2/default.nix b/overlays/kassandra2/default.nix
new file mode 100644
index 00000000..de3ff889
--- /dev/null
+++ b/overlays/kassandra2/default.nix
@@ -0,0 +1,7 @@
+final: prev: let
+  master = import prev.sources.nixpkgs-master {};
+  kassandra = master.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") {};
+  standalone = master.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
+in  {
+  kassandra2 = standalone;
+}
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 06c46f1a..f152f63e 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -33,7 +33,7 @@ self: super: {
     '';
   };
   desktop-pkgs = {
-    inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra;
+    inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra kassandra2;
     inherit (self.gnomeExtensions) appindicator system-monitor;
     inherit (self.gnome3)
       dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme