summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-01-28 09:08:28 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-01-28 09:08:28 -0600
commit0ee569694c03ca3e2c007e391029a3e87fd0c147 (patch)
treec9292192ecf1a13eec5b6be4b893c6c85bcd8b39 /pkgs/top-level/all-packages.nix
parentc0eff1de61dcacaa7023e9800f8e3a8a2c76231a (diff)
parentaa308252ac8ff9f2cfde1038b10f9287c1b1b9fc (diff)
downloadnixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar.gz
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar.bz2
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar.lz
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar.xz
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.tar.zst
nixpkgs-0ee569694c03ca3e2c007e391029a3e87fd0c147.zip
Merge pull request #6029 from ttuegel/plasma52
Plasma 5.2 preview
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37854396574..0a051c3ca96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5826,7 +5826,8 @@ let
   kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
     stdenv = overrideGCC stdenv gccStdInc;
   });
-  kf5_latest = kf55;
+  kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
+  kf5_latest = kf56;
   kf5_stable = kf55;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
@@ -5892,6 +5893,7 @@ let
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
+  libbluedevil-qt5 = callPackage ../development/libraries/libbluedevil/qt5.nix { };
 
   libbluray = callPackage ../development/libraries/libbluray { };
 
@@ -12483,7 +12485,8 @@ let
   plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
     stdenv = overrideGCC stdenv gccStdInc;
   });
-  plasma5_latest = plasma51;
+  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
+  plasma5_latest = plasma52;
   plasma5_stable = plasma51;
 
   kde5 = kf55 // plasma51 // kdeApps_14_12;