Author: eelco
Date: Fri Jul 29 14:16:12 2011
New Revision: 28000
URL: https://svn.nixos.org/websvn/nix/?rev=28000&sc=1
Log:
* Updated kdewebdev.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kommander.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
13:50:53 2011 (r27999)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
14:16:12 2011 (r28000)
@@ -161,7 +161,6 @@
filelight = callPackage ./utils/filelight.nix { };
};
- /*
kdewebdev = combinePkgs "kdewebdev" {
klinkstatus = callPackage ./webdev/klinkstatus.nix { };
kommander = callPackage ./webdev/kommander.nix { };
@@ -169,6 +168,7 @@
kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
};
+ /*
kdepim_runtime = callPackage ./pim-runtime { };
kdepim = callPackage ./pim { };
*/
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
Fri Jul 29 13:50:53 2011 (r27999)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kfilereplace.nix
Fri Jul 29 14:16:12 2011 (r28000)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
meta = {
description = "Batch search and replace tool";
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
Fri Jul 29 13:50:53 2011 (r27999)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kimagemapeditor.nix
Fri Jul 29 14:16:12 2011 (r28000)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
meta = {
description = "An HTML imagemap editor";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
Fri Jul 29 13:50:53 2011 (r27999)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/klinkstatus.nix
Fri Jul 29 14:16:12 2011 (r28000)
@@ -1,9 +1,9 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy,
- ruby }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt, kdepimlibs
+, boost, htmlTidy }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost
- htmlTidy ruby ];
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt kdepimlibs boost
htmlTidy ];
meta = {
description = "A KDE link checker";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kommander.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kommander.nix Fri Jul
29 13:50:53 2011 (r27999)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/webdev/kommander.nix Fri Jul
29 14:16:12 2011 (r28000)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, libxml2, libxslt }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon libxml2 libxslt ];
meta = {
description = "A graphical editor of scripted dialogs";
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
