Remove top-level kde5 attribute

- There is no such thing as KDE 5

6 files changed, 67 insertions, 53 deletions

diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index e3ebc5fde08ec..1a47b74e21c72 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -6,7 +6,7 @@
   gcc,
   ginac,
   jamomacore,
-  kde5,
+  kdnssd,
   libsndfile,
   ninja,
   portaudio,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     ginac
     gcc
     jamomacore
-    kde5.kdnssd
+    kdnssd
     libsndfile
     ninja
     portaudio
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 3cf6f7d754be0..fe09f7ff16eae 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }:
+{ stdenv, cmake, plasma-framework, redshift, fetchFromGitHub, }:
 
 let version = "1.0.17"; in
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     cmake
-    kde5.plasma-framework
+    plasma-framework
   ];
 
 
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 3284b2709c866..a53bbedc2c543 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -20,31 +20,34 @@ still shows most of the available features is in `./gwenview.nix`.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, fetchurl,
+  plasma5,
+  attica, phonon,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib stdenv;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
 
     kdeApp = import ./kde-app.nix {
       inherit lib;
       inherit debug srcs;
-      inherit kdeDerivation;
+      inherit (libsForQt5) kdeDerivation;
     };
 
     kdelibs = callPackage ./kdelibs {
       inherit (srcs.kdelibs) src version;
-      inherit (pkgs) attica phonon;
+      inherit attica phonon;
     };
 
     akonadi = callPackage ./akonadi.nix {};
@@ -54,9 +57,7 @@ let
     baloo-widgets = callPackage ./baloo-widgets.nix {};
     dolphin = callPackage ./dolphin.nix {};
     dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
-      ffmpeg = pkgs.ffmpeg_2;
-    };
+    ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
     filelight = callPackage ./filelight.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
@@ -85,9 +86,11 @@ let
     okteta = callPackage ./okteta.nix {};
     okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {};
+    spectacle = callPackage ./spectacle.nix {
+      inherit (plasma5) kscreen;
+    };
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 3ac1c51848e93..e42a543ea23db 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -19,19 +19,21 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
+  gconf,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
     plasmaPackage = args:
@@ -39,7 +41,7 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in kdeDerivation (args // {
+      in libsForQt5.kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
@@ -86,7 +88,7 @@ let
     plasma-integration = callPackage ./plasma-integration.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {
-      inherit (pkgs.gnome3) gconf;
+      inherit gconf;
     };
     plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
@@ -96,4 +98,4 @@ let
     systemsettings = callPackage ./systemsettings.nix {};
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ac6b319a0ddd7..a4e64aaee41e9 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -19,7 +19,7 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28bfd94d119f3..27f6dce1cde1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7846,7 +7846,7 @@ with pkgs;
 
   judy = callPackage ../development/libraries/judy { };
 
-  kdelibs4 = kde5.applications.kdelibs;
+  kdelibs4 = kdeApplications.kdelibs;
 
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
@@ -12791,7 +12791,7 @@ with pkgs;
 
   calligra = kde4.callPackage ../applications/office/calligra {
     vc = vc_0_7;
-    oxygen_icons = kde5.oxygen-icons5;
+    oxygen_icons = libsForQt5.oxygen-icons5;
   };
 
   camlistore = callPackage ../applications/misc/camlistore { };
@@ -14048,17 +14048,29 @@ with pkgs;
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
+  kdeApplications = import ../desktops/kde-5/applications {
+    inherit stdenv lib libsForQt5 fetchurl;
+    inherit plasma5;
+    inherit attica phonon;
+  };
+
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
-  kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
+  kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer {
+    inherit (plasma5) kdecoration;
+  };
 
-  kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
+  kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
 
-  kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+  kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+    inherit (kdeApplications) konsole;
+    inherit (plasma5) libksysguard;
     llvmPackages = llvmPackages_38;
   };
 
-  kdevplatform = kde5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {};
+  kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {
+    inherit (kdeApplications) libkomparediff2;
+  };
 
   keepnote = callPackage ../applications/office/keepnote { };
 
@@ -14080,14 +14092,18 @@ with pkgs;
     qt = qt4;
   };
 
-  kile = kde5.callPackage ../applications/editors/kile { };
+  kile = libsForQt5.callPackage ../applications/editors/kile {
+    inherit (kdeApplications) konsole;
+  };
 
   kino = callPackage ../applications/video/kino {
     inherit (gnome2) libglade;
     ffmpeg = ffmpeg_2;
   };
 
-  kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {};
+  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins {
+    inherit (kdeApplications) libkipi;
+  };
 
   kiwix = callPackage ../applications/misc/kiwix {
     stdenv = overrideCC stdenv gcc49;
@@ -16050,7 +16066,9 @@ with pkgs;
 
   yabar = callPackage ../applications/window-managers/yabar { };
 
-  yakuake = kde5.callPackage ../applications/misc/yakuake {};
+  yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
+    inherit (kdeApplications) konsole;
+  };
 
   yarp = callPackage ../applications/science/robotics/yarp {};
 
@@ -16210,7 +16228,9 @@ with pkgs;
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
-  digikam = kde5.callPackage ../applications/graphics/digikam {
+  digikam = libsForQt5.callPackage ../applications/graphics/digikam {
+    inherit (kdeApplications) libkipi marble;
+    inherit (plasma5) oxygen;
     boost = boost160;
   };
 
@@ -16779,7 +16799,7 @@ with pkgs;
       );
     in recurseIntoAttrs self;
 
-  lumina = qt5.callPackage ../desktops/lumina { };
+  lumina = libsForQt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
     inherit pkgs libsForQt5 fetchFromGitHub;
@@ -16795,11 +16815,16 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
+  plasma5 = import ../desktops/kde-5/plasma {
+    inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
+    inherit (gnome3) gconf;
+  };
+
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;
   };
 
-  redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { };
+  redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
 
   orion = callPackage ../misc/themes/orion {};
 
@@ -16813,22 +16838,6 @@ with pkgs;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
-  kde5 =
-    let
-      plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
-      applications = import ../desktops/kde-5/applications { inherit pkgs; };
-      merged = self:
-        {
-          plasma = plasma self;
-          frameworks = libsForQt5.kdeFrameworks;
-          applications = applications self;
-        }
-        // libsForQt5.kdeFrameworks
-        // plasma self
-        // applications self;
-    in
-      recurseIntoAttrs (lib.makeScope libsForQt5.newScope merged);
-
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {