kdeApplications: 16.12.3 -> 17.04.0

pkgs/applications/kde/ark/default.nix

@@ -4,7 +4,7 @@
   extra-cmake-modules, kdoctools, makeWrapper,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
-  kservice, kpty, kwidgetsaddons, libarchive,
+  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -22,7 +22,7 @@ let
       ];
       propagatedBuildInputs = [
         khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-        kpty kwidgetsaddons libarchive
+        kpty kwidgetsaddons libarchive kitemmodels
       ];
       postInstall =
         let

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )

pkgs/applications/kde/kcachegrind.nix

@@ -1,7 +1,8 @@
 {
   kdeApp, lib, kdeWrapper,
-  cmake, automoc4,
+  extra-cmake-modules, kdoctools,
-  kdelibs, perl, python, php
+  kio, ki18n,
+  perl, python, php
 }:
 
 kdeWrapper {
@@ -11,8 +12,8 @@ kdeWrapper {
       license = with lib.licenses; [ gpl2 ];
       maintainers = with lib.maintainers; [ orivej ];
     };
-    nativeBuildInputs = [ cmake automoc4 ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    buildInputs = [ kdelibs perl python php ];
+    buildInputs = [ perl python php kio ki18n ];
     enableParallelBuilding = true;
   };
 

pkgs/applications/kde/marble.nix

@@ -1,6 +1,8 @@
 { kdeApp, lib, kdeWrapper
-, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
+, extra-cmake-modules, kdoctools
-, gpsd
+, qtscript, qtsvg, qtquickcontrols, qtwebkit
+, krunner, shared_mime_info, kparts, knewstuff
+, gpsd, perl
 }:
 
 let
@@ -9,9 +11,10 @@ let
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
-      nativeBuildInputs = [ extra-cmake-modules ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
       propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols
+        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
+        krunner kparts knewstuff
         gpsd
       ];
 
@@ -20,6 +23,6 @@ let
 in
 kdeWrapper {
   inherit unwrapped;
-  targets = [ "bin/marble-qt" ];
+  targets = [ "bin/marble-qt" "bin/marble" ];
   paths = [ unwrapped ];
 }