merge trunk

A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947

10 files changed, 62 insertions, 89 deletions

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index d1e79bae0828..0b2383126294 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
+{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
+, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
+, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
+, strigi, soprano }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
+  buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
     libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
     soprano qca2 libmtp liblastfm libgpod pkgconfig ];
 
diff --git a/pkgs/applications/misc/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix
deleted file mode 100644
index 087c3ea045c9..000000000000
--- a/pkgs/applications/misc/filelight/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace,
-automoc4, phonon}:
-
-stdenv.mkDerivation {
-  name = "filelight-1.9rc3";
-  src = fetchurl {
-    url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
-    sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
-  };
-  patches = [ ./gcc45.diff ];
-  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon 
-    qimageblitz ];
-  meta = {
-    description = "Shows disk usage as an interactive map of concentric rings";
-    license = "GPL";
-    homepage = http://www.methylblue.com/filelight/;
-    maintainers = [ lib.maintainers.viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/filelight/gcc45.diff b/pkgs/applications/misc/filelight/gcc45.diff
deleted file mode 100644
index dcce2edaf16b..000000000000
--- a/pkgs/applications/misc/filelight/gcc45.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
-index 68ec189..feb0e53 100644
---- a/src/app/mainWindow.cpp
-+++ b/src/app/mainWindow.cpp
-@@ -222,7 +222,7 @@ inline void MainWindow::slotComboScan()
- 
- inline bool MainWindow::slotScanPath(const QString &path)
- {
--    return slotScanUrl(KUrl::KUrl(path));
-+    return slotScanUrl(KUrl(path));
- }
- 
- bool MainWindow::slotScanUrl(const KUrl &url)
-diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp
-index d48a673..762f74e 100644
---- a/src/part/radialMap/widget.cpp
-+++ b/src/part/radialMap/widget.cpp
-@@ -64,7 +64,7 @@ RadialMap::Widget::path() const
- KUrl
- RadialMap::Widget::url(File const * const file) const
- {
--    return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath());
-+    return KUrl(file ? file->fullPath() : m_tree->fullPath());
- }
- 
- void
diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
index 6da0b8410a0c..467308480243 100644
--- a/pkgs/applications/misc/kde-wacomtablet/default.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs }:
+{ stdenv, fetchurl, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "wacomtablet-1.2.5";
+  name = "wacomtablet-1.3.5";
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz";
-    sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf";
+    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
+    sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
   };
 
-  buildInputs = [ automoc4 cmake kdelibs ];
+  buildInputs = [ kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = with stdenv.lib; {
     description = "KDE Wacom graphic tablet configuration tool";
-    license = "GPLv2";
+    license = licenses.gpl2Plus;
     homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu maintainers.urkud ];
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index f395e64ddb54..05e62ba38446 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}:
+{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}:
 
 stdenv.mkDerivation rec {
-  name = "krusader-2.2.0-beta1";
+  name = "krusader-2.4.0-beta1";
   src = fetchurl {
     url = "mirror://sourceforge/krusader/${name}.tar.bz2";
-    sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
+    sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
   };
-  buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ];
+  buildInputs = [ gettext kdelibs kde_baseapps ];
   meta = {
     description = "Norton/Total Commander clone for KDE";
     license = "GPL";
diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix
index 939797d9dc5a..8aab11beec3c 100644
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/pkgs/applications/misc/rsibreak/default.nix
@@ -1,12 +1,20 @@
-{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "rsibreak-0.10";
+  name = "rsibreak-0.11";
 
   src = fetchurl {
-    url = "http://www.rsibreak.org/files/${name}.tar.bz2";
-    sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+    url = "${meta.homepage}/files/${name}.tar.bz2";
+    sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
   };
 
-  buildInputs = [ cmake kdelibs kdebase_workspace ];
+  buildNativeInputs = [ gettext ];
+
+  buildInputs = [ kdelibs kdebase_workspace ];
+
+  meta = {
+    homepage = http://www.rsibreak.org/;
+    description = "Repetitive Strain Injury prevention";
+    inherit (kdelibs.meta) platforms maintainers;
+  };
 }
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 263bc09ff322..e06f812a18a5 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }:
+{ stdenv, fetchurl, kdelibs, gettext }:
 
-stdenv.mkDerivation rec {
-  name = "yakuake-2.9.7";
+let
+  pname = "yakuake";
+  version = "2.9.8";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.berlios.de/yakuake/${name}.tar.bz2";
-    sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2";
+    sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3";
   };
 
-  buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ];
+  buildInputs = [ kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = {
     homepage = http://yakuake.kde.org;
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
index ee37c2450a64..2a2858996f9e 100644
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
-, gettext}:
+{ stdenv, fetchurl, kdelibs, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "rekonq-0.7.0";
-  passthru = { inherit stdenv; };
+  name = "rekonq-0.8.1";
 
   src = fetchurl {
     url = "mirror://sf/rekonq/${name}.tar.bz2";
-    sha256 = "14gi8ic53jkam2v52zp4p965dw6pqhjm3xhqssm5vimx7hp0kc1w";
+    sha256 = "0zwvdk66q9iphdkrhn850p9f0h8lads9qx3v6dnq15gfk793nz4h";
   };
 
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ];
+  buildInputs = [ kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/sync/akunambol/default.nix b/pkgs/applications/networking/sync/akunambol/default.nix
index c27d8787bee6..2aedfd7f8334 100644
--- a/pkgs/applications/networking/sync/akunambol/default.nix
+++ b/pkgs/applications/networking/sync/akunambol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback }:
+{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }:
 
 stdenv.mkDerivation rec {
   name = "akunambol-20110304";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d";
   };
 
-  buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ];
+  buildInputs = [ kdepimlibs funambol liblikeback ];
   KDEDIRS = liblikeback;
 
   patches = [ ./non-latin.diff ];
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 3f161b5249d7..209ba934b9ef 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,20 +1,22 @@
 {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}:
 
-stdenv.mkDerivation rec {
-  name = "hol_light-20111106";
-  src = fetchsvn {
-    url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "112";
-    sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129";
-  };
-
-  buildInputs = [ ocaml findlib camlp5 ];
-
+let
   start_script = ''
     #!/bin/sh
     cd "$out/lib/hol_light"
     exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml
   '';
+in
+
+stdenv.mkDerivation {
+  name = "hol_light-20111204";
+  src = fetchsvn {
+    url = http://hol-light.googlecode.com/svn/trunk;
+    rev = "114";
+    sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
+  };
+
+  buildInputs = [ ocaml findlib camlp5 ];
 
   buildPhase = ''
     make pa_j.ml