diff options
author | Yaroslav Bolyukin <iam@lach.pw> | 2021-06-18 21:32:56 +0300 |
---|---|---|
committer | Raphael Megzari <raphael@megzari.com> | 2021-08-05 17:01:19 +0900 |
commit | 85dcd8d3ed9826d09aacc68b2212b366c266e882 (patch) | |
tree | 082e0495ff44c1e839652c0235532430d38b0414 /pkgs/desktops/plasma-5 | |
parent | a5cf968a5f7f0c93dcb375aefd4e8f90fec4b215 (diff) | |
download | nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar.gz nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar.bz2 nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar.lz nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar.xz nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.tar.zst nixpkgs-85dcd8d3ed9826d09aacc68b2212b366c266e882.zip |
ksysguard: replace with throw alias
It was deprecated in favour of system-monitor Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Diffstat (limited to 'pkgs/desktops/plasma-5')
-rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/kdeplasma-addons.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/ksysguard.nix | 17 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/default.nix | 4 |
4 files changed, 6 insertions, 22 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 9252aa7b39b..5530d188df0 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 94cf73084bf..77e3cad8d48 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 2c376b53750..00000000000 --- 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 e6b161a0723..aea3c468d7c 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 ]; |