svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31390

pkgs/desktops/kde-4.8/kactivities.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE activities library and daemon";
+  };
+}

pkgs/desktops/kde-4.8/kde-package/4.7.97.nix

@@ -116,13 +116,6 @@ modules=[
     { name="svgpart";  }
   ];
 }
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kactivities";  }
-  ];
-}
 {
   module="kdeutils";
   split=true;
@@ -208,6 +201,7 @@ sane="kde_baseapps";  split=true;
     { name="konsole";  }
   ];
 }
+{ module="kactivities";  split=false;}
 { module="kdeadmin";  split=false;
   pkgs=[
     { name="strigi-analyzer"; sane="strigi_analyzer";}
@@ -235,7 +229,6 @@ sane="kde_baseapps";  split=true;
   ];
 
 }
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
 { module="kdegames";  split=false;}
 { module="kdelibs";  split=false;}
 { module="kdemultimedia";  split=false;}

pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh

@@ -34,6 +34,7 @@ fi
 eval `xsltproc kde-submodules.xslt kde_projects.xml`
 
 module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
 
 print_sane() {
   echo "Called print_sane $1" >&2

pkgs/desktops/kde-4.8/kdeedu/analitza.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+  buildInputs = [ kdelibs readline ];
+
+  meta = {
+    description = "Library part of KAlgebra";
+  };
+}

pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix

@@ -0,0 +1,10 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+  # Needs kdebase for libkonq
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Svn plugin for dolphin";
+  };
+}

pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix

@@ -0,0 +1,10 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+  # Needs kdebase for libkonq
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Svn plugin for dolphin";
+  };
+}

pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, qca2 }:
+
+kde {
+  buildInputs = [ kdelibs qca2 ];
+
+  meta = {
+    description = "KDE implementation of SecretsService";
+  };
+}

pkgs/desktops/kde-4.8/oxygen-icons.nix

@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0";
+  outputHash = "ca03ee0a7bbd35ee70f84d32b6f861ee8c019473f16c6ecf6309885317bcfe51";
 
   buildNativeInputs = [ cmake ];