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