diff --git a/nix/sources.json b/nix/sources.json
index d0a89a50..f36ecebb 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -20,7 +20,7 @@
     "kassandra2": {
         "ref": "master",
         "repo": "git@hera.m-0.eu:kassandra2",
-        "rev": "2590f2dfa35b6a5a22993c5a79c50a8596febf5d",
+        "rev": "43a24502c71ed78e9fc668f22ffd9a45718d34df",
         "type": "git"
     },
     "nix-output-monitor": {
@@ -44,7 +44,7 @@
     "nixos-mailserver": {
         "ref": "master",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
-        "rev": "7d2020cb362aa4c16fad9d1151820a21a26bd5fe",
+        "rev": "ee1ad50830b479ed8fb46c4c51d3bcdbc2184b8b",
         "type": "git"
     },
     "nixpkgs": {
@@ -65,10 +65,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "02f13a4245a391514a9278ed210b8831b07af4c3",
-        "sha256": "02yfllf0mwyqcsfzk2hvfgcl8x891afwfp3wzg0c9mzsxzkbbp8m",
+        "rev": "4f2880ba128a8f254bea5459d3326edea4d3933d",
+        "sha256": "1dsi1x2z5dqw66jr8b1ydgq1bxg2fybgic3aq6kvjy6qvra2iyrx",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/02f13a4245a391514a9278ed210b8831b07af4c3.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/4f2880ba128a8f254bea5459d3326edea4d3933d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "obelisk": {
diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix
index e326550b..23183808 100644
--- a/overlays/30-ghc.nix
+++ b/overlays/30-ghc.nix
@@ -4,10 +4,6 @@ let
   master = import super.sources.nixpkgs-master { };
   inherit (master.haskell.lib) overrideCabal unmarkBroken;
   myOverrides = self: super: {
-    optics = super.optics_0_3;
-    optics-th = super.optics-th_0_3_0_2;
-    optics-core = super.optics-core_0_3_0_1;
-    optics-extra = super.optics-extra_0_3;
   };
   makeHaskellScriptPackages = p: {
     inherit (p)
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 70188996..743fdc8e 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 kassandra2 shotcut;
+    inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra shotcut; # kassandra2
     inherit (self.gnomeExtensions) appindicator system-monitor;
     inherit (self.gnome3)
       dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
diff --git a/overlays/testing.nix b/overlays/testing.nix
index 4d512e0e..7fe8f0ef 100644
--- a/overlays/testing.nix
+++ b/overlays/testing.nix
@@ -13,7 +13,7 @@ let
       logFile <- mktemp |> captureTrim
       let command = (${commandline}) &!> StdOut &> Append logFile
           failHandler = do
-            say [i|### Build failure for ${name} config for #{hostname} ###|]
+            say [i|--- Build failure for ${name} config for #{hostname} ---|]
             cat logFile
       say [i|Trying to build ${name} config for #{hostname}. Logging to #{logFile}.|]
       onException command failHandler