Merge branch 'kde5'

nixos/modules/programs/ssh.nix

@@ -9,7 +9,7 @@ let
   cfg  = config.programs.ssh;
   cfgd = config.services.openssh;
 
-  askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+  askPassword = cfg.askPassword;
 
   askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper"
     ''
@@ -26,6 +26,12 @@ in
 
     programs.ssh = {
 
+      askPassword = mkOption {
+        type = types.string;
+        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+        description = ''Program used by SSH to ask for passwords.'';
+      };
+
       forwardX11 = mkOption {
         type = types.bool;
         default = false;

nixos/modules/services/x11/desktop-managers/kde5.nix

@@ -88,7 +88,9 @@ in
     };
 
     environment.systemPackages =
-      [
+      filter isDerivation (builtins.attrValues plasma5)
+      ++ filter isDerivation (builtins.attrValues kf5)
+      ++ [
         pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
 
         kdeApps.kde-baseapps
@@ -97,13 +99,12 @@ in
         kdeApps.konsole
         kdeApps.oxygen-icons
 
+        kdeApps.kde-runtime
+
         pkgs.hicolor_icon_theme
 
         pkgs.orion # GTK theme, nearly identical to Breeze
-      ]
+      ] ++ phononBackendPackages;
-      ++ filter isDerivation (builtins.attrValues plasma5)
-      ++ filter isDerivation (builtins.attrValues kf5)
-      ++ phononBackendPackages;
 
     environment.pathsToLink = [ "/share" ];
 
@@ -121,6 +122,8 @@ in
 
     fonts.fonts = [ plasma5.oxygen-fonts ];
 
+    programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass";
+
     # Enable helpful DBus services.
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;

pkgs/applications/kde-apps-14.12/default.nix

@@ -201,6 +201,7 @@ let
         NIX_CFLAGS_COMPILE =
           (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
           + " -I${ilmbase}/include/OpenEXR";
+        meta = { priority = 10; };
       };
 
       kde-workspace = with pkgs; super.kde-workspace // {
@@ -214,6 +215,7 @@ let
         nativeBuildInputs =
           super.kde-workspace.nativeBuildInputs
           ++ [ pkgconfig ];
+        meta = { priority = 10; };
       };
 
       kdelibs = with pkgs; super.kdelibs // {

pkgs/applications/kde-apps-14.12/manifest.sh

@@ -6,6 +6,8 @@ if [ $# -eq 0 ]; then
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
       http://download.kde.org/stable/applications/14.12.1/ \
+      http://download.kde.org/stable/applications/14.12.2/ \
+      http://download.kde.org/stable/applications/14.12.3/ \
       -A '*.tar.xz'
 
 else

pkgs/development/libraries/kde-frameworks-5.7/default.nix

@@ -32,7 +32,7 @@ let
           ]
           ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
-        meta = drv.meta or
+        meta =
           {
             license = with stdenv.lib.licenses; [
               lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
@@ -40,7 +40,7 @@ let
             platforms = stdenv.lib.platforms.linux;
             maintainers = with stdenv.lib.maintainers; [ ttuegel ];
             homepage = "http://www.kde.org";
-          };
+          } // (drv.meta or {});
       });
 
   renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];