plasma5: Hide internal plasmaPackage deriver

pkgs/desktops/plasma-5/breeze-qt4.nix

@@ -1,20 +1,12 @@
 {
-  stdenv, lib, src, version,
+  plasmaPackage, lib,
   automoc4, cmake, perl, pkgconfig,
   kdelibs4, qt4, xproto
 }:
 
-stdenv.mkDerivation {
+plasmaPackage {
-  name = "breeze-qt4-${version}";
+  name = "breeze-qt4";
-  meta = {
+  sname = "breeze";
-    license = with lib.licenses; [
-      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-    ];
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ttuegel ];
-    homepage = "http://www.kde.org";
-  };
-  inherit src;
   buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   cmakeFlags = [

pkgs/desktops/plasma-5/build-support/package.nix

@@ -0,0 +1,27 @@
+{ kdeDerivation, lib, fetchurl }:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ../srcs.nix { inherit fetchurl mirror; };
+in
+
+args:
+
+let
+  inherit (args) name;
+  sname = args.sname or name;
+  inherit (srcs."${sname}") src version;
+in
+kdeDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  meta = {
+    license = with lib.licenses; [
+      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})

pkgs/desktops/plasma-5/default.nix

@@ -25,77 +25,57 @@ existing packages here and modify it as necessary.
 */
 
 {
-  stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
+  libsForQt5, kdeDerivation, lib, fetchurl,
-  gconf, kdeDerivation,
+  gconf,
   debug ? false,
 }:
 
 let
-
+  packages = self: with self;
-  mirror = "mirror://kde";
+    let
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
+      callPackage = self.newScope {
-
+        plasmaPackage = import ./build-support/package.nix {
-  packages = self: with self; {
+          inherit kdeDerivation lib fetchurl;
-    plasmaPackage = args:
+        };
-      let
+      };
-        inherit (args) name;
+    in {
-        sname = args.sname or name;
+      bluedevil = callPackage ./bluedevil.nix {};
-        inherit (srcs."${sname}") src version;
+      breeze-gtk = callPackage ./breeze-gtk.nix {};
-      in kdeDerivation (args // {
+      breeze-qt4 = callPackage ./breeze-qt4.nix {};
-        name = "${name}-${version}";
+      breeze-qt5 = callPackage ./breeze-qt5.nix {};
-        inherit src;
+      breeze-grub = callPackage ./breeze-grub.nix {};
-
+      breeze-plymouth = callPackage ./breeze-plymouth {};
-        meta = {
+      kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
-          license = with lib.licenses; [
+      kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+      kde-gtk-config = callPackage ./kde-gtk-config {};
-          ];
+      kdecoration = callPackage ./kdecoration.nix {};
-          platforms = lib.platforms.linux;
+      kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-          maintainers = with lib.maintainers; [ ttuegel ];
+      kgamma5 = callPackage ./kgamma5.nix {};
-          homepage = "http://www.kde.org";
+      khotkeys = callPackage ./khotkeys.nix {};
-        } // (args.meta or {});
+      kinfocenter = callPackage ./kinfocenter.nix {};
-      });
+      kmenuedit = callPackage ./kmenuedit.nix {};
-
+      kscreen = callPackage ./kscreen.nix {};
-    bluedevil = callPackage ./bluedevil.nix {};
+      kscreenlocker = callPackage ./kscreenlocker.nix {};
-    breeze-gtk = callPackage ./breeze-gtk.nix {};
+      ksshaskpass = callPackage ./ksshaskpass.nix {};
-    breeze-qt4 = callPackage ./breeze-qt4.nix {
+      ksysguard = callPackage ./ksysguard.nix {};
-      inherit (srcs.breeze) src version;
+      kwallet-pam = callPackage ./kwallet-pam.nix {};
+      kwayland-integration = callPackage ./kwayland-integration.nix {};
+      kwin = callPackage ./kwin {};
+      kwrited = callPackage ./kwrited.nix {};
+      libkscreen = callPackage ./libkscreen.nix {};
+      libksysguard = callPackage ./libksysguard {};
+      milou = callPackage ./milou.nix {};
+      oxygen = callPackage ./oxygen.nix {};
+      plasma-desktop = callPackage ./plasma-desktop {};
+      plasma-integration = callPackage ./plasma-integration.nix {};
+      plasma-nm = callPackage ./plasma-nm {};
+      plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+      plasma-workspace = callPackage ./plasma-workspace {};
+      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
+      polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
+      powerdevil = callPackage ./powerdevil.nix {};
+      startkde = callPackage ./startkde {};
+      systemsettings = callPackage ./systemsettings.nix {};
     };
-    breeze-qt5 = callPackage ./breeze-qt5.nix {};
+in
-    breeze-grub = callPackage ./breeze-grub.nix {};
+lib.makeScope libsForQt5.newScope packages
-    breeze-plymouth = callPackage ./breeze-plymouth {};
-    kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
-    kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-    kde-gtk-config = callPackage ./kde-gtk-config {};
-    kdecoration = callPackage ./kdecoration.nix {};
-    kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-    kgamma5 = callPackage ./kgamma5.nix {};
-    khotkeys = callPackage ./khotkeys.nix {};
-    kinfocenter = callPackage ./kinfocenter.nix {};
-    kmenuedit = callPackage ./kmenuedit.nix {};
-    kscreen = callPackage ./kscreen.nix {};
-    kscreenlocker = callPackage ./kscreenlocker.nix {};
-    ksshaskpass = callPackage ./ksshaskpass.nix {};
-    ksysguard = callPackage ./ksysguard.nix {};
-    kwallet-pam = callPackage ./kwallet-pam.nix {};
-    kwayland-integration = callPackage ./kwayland-integration.nix {};
-    kwin = callPackage ./kwin {};
-    kwrited = callPackage ./kwrited.nix {};
-    libkscreen = callPackage ./libkscreen.nix {};
-    libksysguard = callPackage ./libksysguard {};
-    milou = callPackage ./milou.nix {};
-    oxygen = callPackage ./oxygen.nix {};
-    plasma-desktop = callPackage ./plasma-desktop {};
-    plasma-integration = callPackage ./plasma-integration.nix {};
-    plasma-nm = callPackage ./plasma-nm {};
-    plasma-pa = callPackage ./plasma-pa.nix {
-      inherit gconf;
-    };
-    plasma-workspace = callPackage ./plasma-workspace {};
-    plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
-    polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
-    powerdevil = callPackage ./powerdevil.nix {};
-    startkde = callPackage ./startkde {};
-    systemsettings = callPackage ./systemsettings.nix {};
-  };
-
-in lib.makeScope libsForQt5.newScope packages

pkgs/top-level/all-packages.nix

@@ -16822,11 +16822,10 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  plasma5 = import ../desktops/plasma-5 {
+  plasma5 = recurseIntoAttrs (import ../desktops/plasma-5 {
-    inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
+    inherit libsForQt5 kdeDerivation lib fetchurl;
-    inherit kdeDerivation;
     inherit (gnome3) gconf;
-  };
+  });
 
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;