* Update kdeutils.

svn path=/nixpkgs/branches/kde-4.7/; revision=27997

pkgs/desktops/kde-4.7/admin.nix

@@ -1,12 +1,10 @@
 { kde, cmake, qt4, pkgconfig, perl, pythonPackages
 , sip, pycups, pygobject, system_config_printer
 , kdelibs, automoc4, phonon, kdepimlibs, pykde4
-, cups, nettools } @ args:
+, cups, nettools }:
 
 let
 
-  system_config_printer = args.system_config_printer.override { withGUI = false; };
-
 in
 
 kde.package rec {

pkgs/desktops/kde-4.7/default.nix

@@ -1,4 +1,4 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
+{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer } @ args:
 
 let
 
@@ -28,6 +28,8 @@ recurseIntoAttrs rec {
 
 ### SUPPORT
 
+  system_config_printer = args.system_config_printer.override { withGUI = false; };
+
   akonadi = callPackage ./support/akonadi { };
 
   oxygen_icons = callPackage ./support/oxygen-icons { };
@@ -95,8 +97,6 @@ recurseIntoAttrs rec {
     kmouth = callPackage ./accessibility/kmouth.nix { };
   };
 
-  kdeadmin = callPackage ./admin { };
-  
   kdeartwork = combinePkgs "kdeartwork" {
     aurorae = callPackage ./artwork/aurorae.nix { };
     colorSchemes = callPackage ./artwork/color-schemes.nix { };
@@ -112,7 +112,6 @@ recurseIntoAttrs rec {
   };
   
   kdeedu = callPackage ./edu { };
-  kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
@@ -138,6 +137,7 @@ recurseIntoAttrs rec {
     poxml = callPackage ./sdk/poxml.nix { };
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
+    okteta = callPackage ./utils/okteta.nix { };
   };
   
   kdetoys = combinePkgs "kdetoys" {
@@ -145,6 +145,7 @@ recurseIntoAttrs rec {
     kteatime = callPackage ./toys/kteatime.nix { };
     ktux = callPackage ./toys/ktux.nix { };
   };
+  */
 
   kdeutils = combinePkgs "kdeutils" {
     ark = callPackage ./utils/ark.nix { };
@@ -156,12 +157,13 @@ recurseIntoAttrs rec {
     kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
     ktimer = callPackage ./utils/ktimer.nix { };
     kwallet = callPackage ./utils/kwallet.nix { };
-    okteta = callPackage ./utils/okteta.nix { };
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
+    filelight = callPackage ./utils/filelight.nix { };
   };
 
+  /*
   kdewebdev = combinePkgs "kdewebdev" {
     klinkstatus = callPackage ./webdev/klinkstatus.nix { };
     kommander = callPackage ./webdev/kommander.nix { };

pkgs/desktops/kde-4.7/sdk/okteta.nix

@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* shared_mime_info qca2 */ ];
+
+  meta = {
+    description = "KDE byte editor";
+    kde = {
+      name = "okteta";
+      module = "kdesdk";
+      version = "0.5.3";
+      versionFile = "program/about.cpp";
+    };
+  };
+}

pkgs/desktops/kde-4.7/utils/ark.nix

@@ -1,11 +1,10 @@
-{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson,
+{ kde, cmake, kdelibs, qt4, libarchive, xz, automoc4
-  kdebase }:
+, phonon, bzip2, kde_baseapps }:
 
 kde.package {
-  patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules";
+  buildInputs =
-
+    [ cmake kdelibs qt4 automoc4 phonon kde_baseapps
-  buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson
+      libarchive xz bzip2
-    kdebase # for libkonq
     ];
 
   meta = {
@@ -13,7 +12,7 @@ kde.package {
     kde = {
       name = "ark";
       module = "kdeutils";
-      version = "2.15";
+      version = "2.17";
       versionFile = "app/main.cpp";
     };
   };

pkgs/desktops/kde-4.7/utils/filelight.nix

@@ -0,0 +1,14 @@
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
+
+  meta = {
+    description = "Tool to visualise file and directory sizes";
+    kde = {
+      name = "filelight";
+      module = "kdeutils";
+      version = "1.10";
+    };
+  };
+}

pkgs/desktops/kde-4.7/utils/kcalc.nix

@@ -1,14 +1,14 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, gmp }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon gmp ];
 
   meta = {
     description = "KDE Calculator";
     kde = {
       name = "kcalc";
       module = "kdeutils";
-      version = "2.7";
+      version = "2.9";
       versionFile = "version.h";
     };
   };

pkgs/desktops/kde-4.7/utils/kcharselect.nix

@@ -1,14 +1,14 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE character selection utility";
     kde = {
       name = "kcharselect";
       module = "kdeutils";
-      version = "1.7";
+      version = "1.9";
       versionFile = "main.cc";
     };
   };

pkgs/desktops/kde-4.7/utils/kdf.nix

@@ -1,14 +1,14 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE free disk space utility";
     kde = {
       name = "kdf";
       module = "kdeutils";
-      version = "0.11";
+      version = "0.13";
       versionFile = "kdf.cpp";
     };
   };

pkgs/desktops/kde-4.7/utils/kfloppy.nix

@@ -1,10 +1,10 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
-    description = "Helps you format floppies with the filesystem of your choice";
+    description = "Floppy disk formatting utility";
     kde = {
       name = "kfloppy";
       module = "kdeutils";

pkgs/desktops/kde-4.7/utils/kgpg.nix

@@ -1,10 +1,10 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, kdepimlibs }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon kdepimlibs ];
 
   meta = {
-    description = "Simple KDE GUI for gpg";
+    description = "Simple KDE GUI for GPG";
     kde = {
       name = "kgpg";
       module = "kdeutils";

pkgs/desktops/kde-4.7/utils/kremotecontrol.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libXtst }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
 
   meta = {
     description = "KDE remote control";

pkgs/desktops/kde-4.7/utils/ktimer.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE Timer";

pkgs/desktops/kde-4.7/utils/kwallet.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "KDE Wallet (password storage) management tool";

pkgs/desktops/kde-4.7/utils/okteta.nix

@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ];
-
-  meta = {
-    description = "KDE byte editor";
-    kde = {
-      name = "okteta";
-      module = "kdeutils";
-      version = "0.5.3";
-      versionFile = "program/about.cpp";
-    };
-  };
-}

pkgs/desktops/kde-4.7/utils/printer-applet.nix

@@ -1,20 +1,31 @@
-{ kde, cmake, kdelibs, qt4, perl, automoc4
+{ kde, cmake, kdelibs, qt4, automoc4, phonon
-, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings,
+, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
-  pythonDBus, makeWrapper }:
+, pythonDBus, makeWrapper }:
 
-kde.package {
+kde.package rec {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl
+  buildInputs =
-    system_config_printer kdebindings makeWrapper pythonDBus ];
+    [ cmake qt4 kdelibs automoc4 phonon
+      pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
 
-  postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $PYTHONPATH";
+  pythonPath = [ pyqt4 pykde4 pycups system_config_printer ];
 
+  postInstall =
+    ''
+      wrapPythonPrograms
+
+      # ‘system-config-printer’ supplies some D-Bus policy that we need.
+      mkdir -p $out/nix-support
+      echo ${system_config_printer} > $out/nix-support/propagated-user-env-packages
+    '';
+    
   meta = {
     description = "KDE printer applet";
     longDescription = "Applet to view current print jobs and configure new printers";
     kde = {
       name = "printer-applet";
       module = "kdeutils";
-      version = "1.5";
+      version = "1.7";
       versionFile = "printer-applet.py";
     };
   };

pkgs/desktops/kde-4.7/utils/superkaramba.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, qimageblitz, python }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon qimageblitz ];
 
   cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE";
 
@@ -10,7 +10,7 @@ kde.package {
     kde = {
       name = "superkaramba";
       module = "kdeutils";
-      version = "0.55";
+      version = "0.57";
       versionFile = "src/main.cpp";
     };
   };

pkgs/desktops/kde-4.7/utils/sweeper.nix

@@ -1,14 +1,14 @@
-{ kde, cmake, perl, kdelibs, qt4, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "Helps clean unwanted traces the user leaves on the system";
     kde = {
       name = "sweeper";
       module = "kdeutils";
-      version = "1.5";
+      version = "1.7";
       versionFile = "main.cpp";
     };
   };