Author: eelco
Date: Wed Jul 13 18:15:57 2011
New Revision: 27768
URL: https://svn.nixos.org/websvn/nix/?rev=27768&sc=1
Log:
* Akonadi updated to 1.6.0.
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/akonadi/fix-broken-datadir-parameter.patch
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/akonadi/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/akonadi/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/akonadi/default.nix
Wed Jul 13 17:47:34 2011 (r27767)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/akonadi/default.nix
Wed Jul 13 18:15:57 2011 (r27768)
@@ -1,13 +1,17 @@
-{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql,
automoc4, soprano}:
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4,
soprano }:
stdenv.mkDerivation rec {
- name = "akonadi-1.4.3";
+ name = "akonadi-1.6.0";
+
src = fetchurl {
- url = "http://download.akonadi-project.org/${name}.tar.bz2";;
- sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk";
+ url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+ sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f";
};
- buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4
soprano ];
- patches = [ ./fix-broken-datadir-parameter.patch ];
+
+ buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ];
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "KDE PIM Storage Service";
license = "LGPL";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Wed Jul
13 17:47:34 2011 (r27767)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Wed Jul
13 18:15:57 2011 (r27768)
@@ -1,6 +1,6 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python
+, libusb, libxklavier, perl, python, libqalculate, akonadi
}:
kde.package {
@@ -10,14 +10,14 @@
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau
soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
- libusb python
+ libusb python libqalculate akonadi
];
# Workaround for ‘undefined reference to `dlsym'’ in kwinglutils_funcs.cpp.
NIX_LDFLAGS = "-ldl";
meta = {
- description = "KDE desktop environment workspace components";
+ description = "KDE workspace components such as Plasma, Kwin and System
Settings";
license = "GPLv2";
kde.name = "kde-workspace";
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
