Author: eelco Date: Fri Jul 29 12:31:07 2011 New Revision: 27997 URL: https://svn.nixos.org/websvn/nix/?rev=27997&sc=1
Log: * Update kdeutils. Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix - copied, changed from r27990, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/okteta.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/filelight.nix Deleted: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/okteta.nix Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ark.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcalc.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcharselect.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kdf.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kfloppy.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kgpg.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ktimer.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kwallet.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/printer-applet.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/superkaramba.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/sweeper.nix Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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 { Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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 @@ ### 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 @@ 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 @@ }; kdeedu = callPackage ./edu { }; - kdegames = callPackage ./games { }; kdegraphics = callPackage ./graphics { }; kdenetwork = callPackage ./network { }; kdeplasma_addons = callPackage ./plasma-addons { }; @@ -138,6 +137,7 @@ 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 @@ kteatime = callPackage ./toys/kteatime.nix { }; ktux = callPackage ./toys/ktux.nix { }; }; + */ kdeutils = combinePkgs "kdeutils" { ark = callPackage ./utils/ark.nix { }; @@ -156,12 +157,13 @@ 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 { }; Copied and modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix (from r27990, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/okteta.nix) ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/okteta.nix Thu Jul 28 14:09:16 2011 (r27990, copy source) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -1,13 +1,13 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }: kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ]; + buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* shared_mime_info qca2 */ ]; meta = { description = "KDE byte editor"; kde = { name = "okteta"; - module = "kdeutils"; + module = "kdesdk"; version = "0.5.3"; versionFile = "program/about.cpp"; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ark.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ark.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ark.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -1,11 +1,10 @@ -{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson, - kdebase }: +{ kde, cmake, kdelibs, qt4, libarchive, xz, automoc4 +, phonon, bzip2, kde_baseapps }: kde.package { - patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules"; - - buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson - kdebase # for libkonq + buildInputs = + [ cmake kdelibs qt4 automoc4 phonon kde_baseapps + libarchive xz bzip2 ]; meta = { @@ -13,7 +12,7 @@ kde = { name = "ark"; module = "kdeutils"; - version = "2.15"; + version = "2.17"; versionFile = "app/main.cpp"; }; }; Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/filelight.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/filelight.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; + }; + }; +} Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcalc.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcalc.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcalc.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcharselect.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcharselect.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kcharselect.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kdf.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kdf.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kdf.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kfloppy.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kfloppy.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kfloppy.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kgpg.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kgpg.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kgpg.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kremotecontrol.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ktimer.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ktimer.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/ktimer.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kwallet.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kwallet.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/kwallet.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/printer-applet.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/printer-applet.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/printer-applet.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -1,20 +1,31 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 -, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings, - pythonDBus, makeWrapper }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon +, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer +, pythonDBus, makeWrapper }: -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl - system_config_printer kdebindings makeWrapper pythonDBus ]; +kde.package rec { + buildInputs = + [ 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"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/superkaramba.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/superkaramba.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/superkaramba.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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 = { name = "superkaramba"; module = "kdeutils"; - version = "0.55"; + version = "0.57"; versionFile = "src/main.cpp"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/sweeper.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/sweeper.nix Fri Jul 29 08:45:58 2011 (r27996) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/utils/sweeper.nix Fri Jul 29 12:31:07 2011 (r27997) @@ -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"; }; }; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits