Author: urkud
Date: Mon Aug 2 17:16:24 2010
New Revision: 22892
URL: https://svn.nixos.org/websvn/nix/?rev=22892&sc=1
Log:
kde-4.5 snapshot
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/
nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/pimlibs/default.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/artwork/default.nix Mon Aug 2
17:16:24 2010 (r22892)
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
+, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
+
+stdenv.mkDerivation {
+ name = "kdeartwork-4.4.92";
+ src = fetchurl {
+ url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+ sha256 = "17c481za2jfrmhd946jbhgwpcyzjkgjkk2jw84wbj8v694ry3xym";
+ };
+ buildInputs = [ cmake qt4 perl xscreensaver
+ kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
+ meta = {
+ description = "KDE artwork";
+ longDescription = "Contains various artwork for KDE such as backgrounds,
icons and screensavers";
+ license = "LGPL";
+ homepage = http://www.kde.org;
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Aug 2 17:14:59
2010 (r22891)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Mon Aug 2 17:16:24
2010 (r22892)
@@ -21,13 +21,13 @@
inherit (pkgs) stdenv fetchurl cmake;
};
- phonon = import ./support/phonon {
- inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
- inherit (pkgs.gst_all) gstreamer gstPluginsBase;
- inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
- inherit automoc4;
- };
-
+# phonon = import ./support/phonon {
+# inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
+# inherit (pkgs.gst_all) gstreamer gstPluginsBase;
+# inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
+# inherit automoc4;
+# };
+#
polkit_qt_1 = import ./support/polkit-qt-1 {
inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
inherit automoc4;
@@ -53,17 +53,17 @@
### LIBS
kdelibs = import ./libs {
- inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2
libxslt;
+ inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2
libxslt;
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi
shared_mime_info
kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
inherit (pkgs.xlibs) libXScrnSaver;
- inherit automoc4 phonon strigi soprano qca2 attica polkit_qt_1;
+ inherit automoc4 strigi soprano qca2 attica polkit_qt_1;
};
kdepimlibs = import ./pimlibs {
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme
libical
openldap shared_mime_info;
- inherit kdelibs automoc4 phonon akonadi;
+ inherit kdelibs automoc4 akonadi soprano;
};
})
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Mon Aug 2
17:14:59 2010 (r22891)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/libs/default.nix Mon Aug 2
17:16:24 2010 (r22892)
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, cmake, lib, perl
+{ stdenv, fetchurl, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr,
shared_desktop_ontologies, libXScrnSaver
-, automoc4, phonon, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
+, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
}:
stdenv.mkDerivation rec {
- name = "kdelibs-4.4.92";
+ name = "kdelibs-4.4.95";
src = fetchurl {
- url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
- sha256 = "03hqn50fls3bpd9xls3bga4g1n4gy1hcxs1dk6wlc2dfklyqshz3";
+ url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
+ sha256 = "1fyjbdbzqxvl7rws4bvra1l4sczc1a72zdin7izif8dyjq6xblj0";
};
buildInputs = [
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
- automoc4 phonon strigi soprano qca2 attica
+ automoc4 strigi soprano qca2 attica
];
propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
@@ -29,10 +29,10 @@
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
];
- meta = {
+ meta = with stdenv.lib; {
description = "KDE libraries";
license = "LGPL";
homepage = http://www.kde.org;
- maintainers = [ lib.maintainers.sander ];
+ maintainers = [ maintainers.sander maintainers.urkud ];
};
}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/pimlibs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/pimlibs/default.nix Mon Aug 2
17:14:59 2010 (r22891)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/pimlibs/default.nix Mon Aug 2
17:16:24 2010 (r22892)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical,
openldap, shared_mime_info
-, kdelibs, automoc4, phonon, akonadi}:
+, kdelibs, automoc4, phonon, akonadi, soprano}:
stdenv.mkDerivation rec {
name = "kdepimlibs-4.4.92";
@@ -10,7 +10,7 @@
};
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
- shared_mime_info kdelibs automoc4 phonon akonadi ];
+ shared_mime_info kdelibs automoc4 phonon akonadi soprano ];
meta = {
description = "KDE PIM libraries";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
