Author: urkud
Date: 2010-06-30 15:52:24 +0000 (Wed, 30 Jun 2010)
New Revision: 22431

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22431&view=rev

Modified:
   nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
   nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix

Log:
Upgrade akonadi to 1.3.85

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix     2010-06-30 05:44:33 UTC 
(rev 22430)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix     2010-06-30 15:52:24 UTC 
(rev 22431)
@@ -41,7 +41,7 @@
   };
   
   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;
   };
   

Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix     
2010-06-30 05:44:33 UTC (rev 22430)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix     
2010-06-30 15:52:24 UTC (rev 22431)
@@ -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;
   };
 }

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to