Merge branch 'kde5'

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"];