From 85dcd8d3ed9826d09aacc68b2212b366c266e882 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:32:56 +0300
Subject: [PATCH] ksysguard: replace with throw alias

It was deprecated in favour of system-monitor

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../services/x11/desktop-managers/plasma5.nix   |  1 -
 pkgs/desktops/plasma-5/default.nix              |  3 ++-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix     |  4 ++--
 pkgs/desktops/plasma-5/ksysguard.nix            | 17 -----------------
 .../plasma-5/plasma-desktop/default.nix         |  4 ++--
 pkgs/top-level/aliases.nix                      |  2 +-
 6 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/ksysguard.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index b6be524aea66..e02e3e6f71ce 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -271,7 +271,6 @@ in
           kmenuedit
           kscreen
           kscreenlocker
-          ksysguard
           kwayland
           kwin
           kwrited
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 9252aa7b39ba..5530d188df01 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -123,12 +123,13 @@ let
       kscreen = callPackage ./kscreen.nix {};
       kscreenlocker = callPackage ./kscreenlocker.nix {};
       ksshaskpass = callPackage ./ksshaskpass.nix {};
-      ksysguard = callPackage ./ksysguard.nix {};
+      ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
       kwallet-pam = callPackage ./kwallet-pam.nix {};
       kwayland-integration = callPackage ./kwayland-integration.nix {};
       kwayland-server = callPackage ./kwayland-server {};
       kwin = callPackage ./kwin {};
       kwrited = callPackage ./kwrited.nix {};
+      layer-shell-qt = callPackage ./layer-shell-qt.nix {};
       libkscreen = callPackage ./libkscreen {};
       libksysguard = callPackage ./libksysguard {};
       milou = callPackage ./milou.nix {};
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 94cf73084bfa..77e3cad8d487 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays,
-  kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard,
+  kio, knewstuff, kpurpose, kross, krunner, kservice,
   kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
   qtwebengine, qtx11extras
 }:
@@ -12,7 +12,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio
-    knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus
+    knewstuff kpurpose kross krunner kservice kunitconversion ibus
     plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
deleted file mode 100644
index 2c376b537503..000000000000
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  libcap, libpcap, lm_sensors,
-  kconfig, kcoreaddons, ki18n, kiconthemes, kinit, kitemviews,
-  knewstuff, libksysguard, qtbase,
-  networkmanager-qt, libnl
-}:
-
-mkDerivation {
-  name = "ksysguard";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kconfig kcoreaddons kitemviews kinit kiconthemes knewstuff libksysguard
-    ki18n libcap libpcap lm_sensors networkmanager-qt libnl
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index e6b161a07232..aea3c468d7ca 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -12,7 +12,7 @@
   attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-  kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon,
+  kpeople, krunner, kscreenlocker, kwallet, kwin, phonon,
   plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput
 }:
 
@@ -28,7 +28,7 @@ mkDerivation {
     attica baloo kaccounts-integration kactivities kactivities-stats kauth
     kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons
     kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig
-    kpeople krunner kscreenlocker ksysguard kwallet kwin plasma-framework
+    kpeople krunner kscreenlocker kwallet kwin plasma-framework
     plasma-workspace qqc2-desktop-style
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bf8154233b88..913878c91789 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1120,7 +1120,7 @@ mapAliases ({
     kgamma5
     kinfocenter
     kmenuedit
-    kscreen kscreenlocker ksshaskpass ksysguard
+    kscreen kscreenlocker ksshaskpass
     kwallet-pam kwayland-integration kwin kwrited
     milou
     oxygen