JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde5: don't expose secret top-level attributes

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-17 05:34:15 -06:00
parent e11741ff99
commit 89ecedcab8
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/top-level/all-packages.nix
View File

@ -6860,10 +6860,6 @@ let
automake = automake111x;
};
kf517 = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
kf5_stable = kf517;
kf5_latest = kf517;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
@ -12221,10 +12217,6 @@ let
boost = boost155;
};
kdeApps_15_12 = import ../applications/kde-apps-15.12 { inherit pkgs; };
kdeApps_stable = kdeApps_15_12;
kdeApps_latest = kdeApps_15_12;
keepnote = callPackage ../applications/office/keepnote {
pygtk = pyGtkGlade;
};
@ -14724,10 +14716,6 @@ let
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
plasma55 = import ../desktops/plasma-5.5 { inherit pkgs; };
plasma5_stable = plasma55;
plasma5_latest = plasma55;
kde5PackagesFun = self: with self; {
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
@ -14769,14 +14757,22 @@ let
};
kde5 =
recurseIntoAttrs
(lib.makeScope qt55Libs.newScope (self:
kf5_stable self // plasma5_stable self // kdeApps_stable self // kde5PackagesFun self));
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in
recurseIntoAttrs (lib.makeScope qt55Libs.newScope merged);
kde5_latest =
recurseIntoAttrs
(lib.makeScope qt55Libs.newScope (self:
kf5_latest self // plasma5_latest self // kdeApps_latest self // kde5PackagesFun self));
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in
recurseIntoAttrs (lib.makeScope qt55Libs.newScope merged);
theme-vertex = callPackage ../misc/themes/vertex { };