Author: urkud
Date: Sat Jan 7 00:07:41 2012
New Revision: 31390
URL: https://nixos.org/websvn/nix/?rev=31390&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kactivities.nix
- copied unchanged from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kactivities.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/analitza.nix
- copied unchanged from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/analitza.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
- copied unchanged from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
- copied unchanged from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
- copied unchanged from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/oxygen-icons.nix
Copied: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kactivities.nix (from
r31389, nixpkgs/trunk/pkgs/desktops/kde-4.8/kactivities.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kactivities.nix Sat Jan
7 00:07:41 2012 (r31390, copy of r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kactivities.nix)
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ propagatedBuildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE activities library and daemon";
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
Sat Jan 7 00:02:36 2012 (r31389)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
Sat Jan 7 00:07:41 2012 (r31390)
@@ -117,13 +117,6 @@
];
}
{
- module="kdelibs";
- split=true;
- pkgs=[
- { name="kactivities"; }
- ];
-}
-{
module="kdeutils";
split=true;
pkgs=[
@@ -208,6 +201,7 @@
{ name="konsole"; }
];
}
+{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
@@ -235,7 +229,6 @@
];
}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdegames"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdemultimedia"; split=false;}
Modified:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
Sat Jan 7 00:02:36 2012 (r31389)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
Sat Jan 7 00:07:41 2012 (r31390)
@@ -34,6 +34,7 @@
eval `xsltproc kde-submodules.xslt kde_projects.xml`
module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
print_sane() {
echo "Called print_sane $1" >&2
Copied: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/analitza.nix
(from r31389, nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeedu/analitza.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeedu/analitza.nix Sat Jan
7 00:07:41 2012 (r31390, copy of r31389,
nixpkgs/trunk/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";
+ };
+}
Copied:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
(from r31389,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-bazaar.nix
Sat Jan 7 00:07:41 2012 (r31390, copy of r31389,
nixpkgs/trunk/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";
+ };
+}
Copied:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
(from r31389, nixpkgs/trunk/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-hg.nix
Sat Jan 7 00:07:41 2012 (r31390, copy of r31389,
nixpkgs/trunk/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";
+ };
+}
Copied: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
(from r31389, nixpkgs/trunk/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix
Sat Jan 7 00:07:41 2012 (r31390, copy of r31389,
nixpkgs/trunk/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";
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/oxygen-icons.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/oxygen-icons.nix Sat Jan
7 00:02:36 2012 (r31389)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/oxygen-icons.nix Sat Jan
7 00:07:41 2012 (r31390)
@@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
"0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0";
+ outputHash =
"ca03ee0a7bbd35ee70f84d32b6f861ee8c019473f16c6ecf6309885317bcfe51";
buildNativeInputs = [ cmake ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
