Author: eelco Date: Fri Jul 29 13:50:53 2011 New Revision: 27999 URL: https://svn.nixos.org/websvn/nix/?rev=27999&sc=1
Log: * Updated kdesdk. Deleted: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kate.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/cervisia.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kmtrace.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kompare.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kpartloader.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kstartperf.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/lokalize.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/poxml.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/scripts.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/umbrello.nix 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 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -115,18 +115,17 @@ kdegraphics = callPackage ./graphics { }; kdenetwork = callPackage ./network { }; kdeplasma_addons = callPackage ./plasma-addons { }; + */ kdesdk = combinePkgs "kdesdk" { cervisia = callPackage ./sdk/cervisia.nix { }; kapptemplate = callPackage ./sdk/kapptemplate.nix { }; - kate = callPackage ./sdk/kate.nix { }; kcachegrind = callPackage ./sdk/kcachegrind.nix { }; kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { }; dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { }; kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { }; kioslave_svn = callPackage ./sdk/kioslave-svn.nix { }; strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { }; - kbugbuster = callPackage ./sdk/kbugbuster.nix { }; kmtrace = callPackage ./sdk/kmtrace.nix { }; kompare = callPackage ./sdk/kompare.nix { }; kpartloader = callPackage ./sdk/kpartloader.nix { }; @@ -137,9 +136,8 @@ poxml = callPackage ./sdk/poxml.nix { }; scripts = callPackage ./sdk/scripts.nix { }; umbrello = callPackage ./sdk/umbrello.nix { }; - okteta = callPackage ./utils/okteta.nix { }; + okteta = callPackage ./sdk/okteta.nix { }; }; - */ kdetoys = combinePkgs "kdetoys" { amor = callPackage ./toys/amor.nix { }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/cervisia.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/cervisia.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/cervisia.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,14 +1,14 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "A KDE CVS frontend"; kde = { name = "cervisia"; module = "kdesdk"; - version = "3.5.0"; + version = "3.7.0"; versionFile = "cervisia/version.h"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,9 +1,11 @@ -{ kde, cmake, kdelibs, automoc4, kdebase }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kde_baseapps, kdepimlibs }: kde.package { # Needs kdebase for libkonq - buildInputs = [ cmake kdelibs automoc4 kdebase ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kde_baseapps ]; + cmakeFlags = "-DBUILD_dolphin-plugins/svn=TRUE -DBUILD_dolphin-plugins/git=TRUE"; + meta = { description = "Git and Svn plugins for dolphin"; kde = { Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,8 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "A KDE 4 project template generator"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "KDE Frontend for Callgrind/Cachegrind"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, kdepimlibs }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kdepimlibs }: kde.package { - buildInputs = [ cmake kdelibs automoc4 kdepimlibs ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kdepimlibs ]; meta = { description = "KDE accounts akonadi agent"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, perl }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, perl }: kde.package { - buildInputs = [ cmake kdelibs automoc4 perl ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi perl ]; cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,13 +1,13 @@ -{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, subversion, apr, aprutil }: kde.package { - buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi subversion apr aprutil ]; patches = [ ./find-svn.patch ]; cmakeFlags = "-DBUILD_kioslave=ON"; meta = { - description = "svn:/ kioslave"; + description = "Subversion kioslave"; kde = { name = "kioslave-svn"; module = "kdesdk"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kmtrace.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kmtrace.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kmtrace.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,12 +1,12 @@ -{ kde, cmake, kdelibs, automoc4, gcc }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, gcc }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; - preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; + preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; meta = { - description = "KDE mtrace-based malloc debuger"; + description = "KDE mtrace-based malloc debugger"; kde = { name = "kmtrace"; module = "kdesdk"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kompare.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kompare.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kompare.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "A program to view the differences between files and optionally generate a diff"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kpartloader.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kpartloader.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kpartloader.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "A test application for KParts"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,11 +1,10 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { - description = "A macros for profiling using QTime"; - longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories."; + description = "A macro for profiling using QTime"; kde = { name = "kprofilemethod"; module = "kdesdk"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kstartperf.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kstartperf.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kstartperf.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, libtool }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libtool }: kde.package { - buildInputs = [ cmake kdelibs automoc4 libtool ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libtool ]; meta = { description = "Measures start up time of a KDE application"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "Displays Qt Designer's UI files"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/lokalize.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/lokalize.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/lokalize.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, hunspell }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, hunspell }: kde.package { - buildInputs = [ cmake kdelibs automoc4 hunspell ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi hunspell ]; meta = { description = "KDE 4 Computer-aided translation system"; @@ -12,7 +12,7 @@ kde = { name = "lokalize"; module = "kdesdk"; - version = "1.1"; + version = "1.2"; versionFile = "src/version.h"; }; }; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/okteta.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, shared_mime_info, qca2 }: kde.package { - buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* shared_mime_info qca2 */ ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi shared_mime_info qca2 ]; meta = { description = "KDE byte editor"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/poxml.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/poxml.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/poxml.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,8 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, antlr }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, antlr }: kde.package { - buildInputs = [ cmake kdelibs automoc4 antlr ]; - + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi antlr ]; meta = { description = "Po<->xml tools"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/scripts.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/scripts.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/scripts.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "Various scripts to ease KDE development"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4 }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }: kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ]; meta = { description = "Strigi analyzers for diff, po and ts"; Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/umbrello.nix ============================================================================== --- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/umbrello.nix Fri Jul 29 12:41:31 2011 (r27998) +++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/sdk/umbrello.nix Fri Jul 29 13:50:53 2011 (r27999) @@ -1,7 +1,7 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }: +{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libxml2, libxslt, boost }: kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ]; + buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libxml2 libxslt boost ]; meta = { description = "Umbrello UML modeller"; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits