Author: urkud
Date: Wed Sep 15 05:19:44 2010
New Revision: 23805
URL: https://svn.nixos.org/websvn/nix/?rev=23805&sc=1
Log:
kdeadmin-4.5.1, kdeplasma-addons-4.5.1. Have no time to split
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/admin/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/plasma-addons/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/admin/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/admin/default.nix Wed Sep 15
05:19:35 2010 (r23804)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/admin/default.nix Wed Sep 15
05:19:44 2010 (r23805)
@@ -8,6 +8,8 @@
inherit system_config_printer;
+ # TODO: split, check which packages work on nixos
+
PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl
system_config_printer
@@ -18,7 +20,7 @@
license = "GPL";
kde = {
name = "kdeadmin";
- version = "4.5.0";
+ version = "4.5.1";
};
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix Wed Sep
15 05:19:35 2010 (r23804)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/manifest.nix Wed Sep
15 05:19:44 2010 (r23805)
@@ -164,4 +164,12 @@
name = "kdegames-4.5.1.tar.bz2";
value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
}
+{
+ name = "kdeplasma-addons-4.5.1.tar.bz2";
+ value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5";
+}
+{
+ name = "kdeadmin-4.5.1.tar.bz2";
+ value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
+}
]
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/plasma-addons/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/plasma-addons/default.nix Wed Sep
15 05:19:35 2010 (r23804)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/plasma-addons/default.nix Wed Sep
15 05:19:44 2010 (r23805)
@@ -5,6 +5,9 @@
kde.package {
+ preConfigure =
+ "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake";
+
buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
libqalculate soprano libXtst kdeedu ];
@@ -14,7 +17,7 @@
license = "GPL";
kde = {
name = "kdeplasma-addons";
- version = "4.5.0";
+ version = "4.5.1";
};
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
