From 1bd76098fe66f182640af3fdd8ea1a47ca6d3a63 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 30 Jun 2010 15:52:24 +0000 Subject: [PATCH] Upgrade akonadi to 1.3.85 svn path=/nixpkgs/trunk/; revision=22431 --- pkgs/desktops/kde-4.4/default.nix | 2 +- .../desktops/kde-4.4/support/akonadi/default.nix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 495682cc23f..08e0bf849e0 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -41,7 +41,7 @@ pkgs.recurseIntoAttrs (rec { }; akonadi = import ./support/akonadi { - inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql; + inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql; inherit automoc4 soprano; }; diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix index 8e0db47ac7a..1f00d0461b9 100644 --- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, lib, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: +{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: -stdenv.mkDerivation { - name = "akonadi-1.3.1"; +stdenv.mkDerivation rec { + name = "akonadi-1.3.85"; src = fetchurl { - url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2; - sha256 = "1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb"; + url = "http://download.akonadi-project.org/${name}.tar.bz2"; + sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck"; }; - includeAllQtDirs=true; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; - meta = { + meta = with stdenv.lib; { description = "KDE PIM Storage Service"; license = "LGPL"; homepage = http://pim.kde.org/akonadi; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.linux; }; }