evolution-data-server: upgrade and move to gnome3 namespace

This commit is contained in:
Domen Kožar 2014-01-20 16:40:38 +01:00
parent dbfaeaf0df
commit 0c9f4cb22a
4 changed files with 28 additions and 58 deletions

View File

@ -0,0 +1,24 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
, p11_kit, db4, nspr, nss, libical, gperf }:
stdenv.mkDerivation rec {
name = "evolution-data-server-3.10.2";
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
sha256 = "1fgchc1gzrhhzgn4zf9par4yz72m82j871kf7pky458mh4c4sf0g";
};
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
# uoa irrelevant for now
configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

View File

@ -24,6 +24,8 @@ rec {
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
evolution_data_server = callPackage ./core/evolution-data-server { };
gconf = callPackage ./core/gconf { };
geocode_glib = callPackage ./core/geocode-glib { };

View File

@ -1,57 +0,0 @@
x@{builderDefsPackage
, pkgconfig, flex, bison, libtool, intltool, perl
, db4, krb5, openldap, glib, libxml2, GConf
, nss, gtk, libgnome, libsoup, gnome_keyring
, gtkdoc, sqlite, libgweather, libical, icu
, dbus_glib, gperf, nspr, gmp, nettle, libgdata_0_6
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
url = "mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2";
hash = "744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c";
version = "2.32.3";
name = "evolution-data-server-${version}";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
configureFlags = [
"--with-nspr-includes=${nspr}/include/nspr"
"--with-nss-includes=${nss}/include/nss"
];
meta = {
description = "Evolution Data Server";
maintainers = with a.lib.maintainers;
[
/* I am only interested in it for libebook... */
raskin
];
platforms = with a.lib.platforms;
linux;
broken = true;
};
passthru = {
updateInfo = {
downloadPage = "http://projects.gnome.org/evolution/download.shtml";
};
};
}) x

View File

@ -7713,8 +7713,9 @@ let
keepassx = callPackage ../applications/misc/keepassx { };
inherit (gnome3) evince;
evolution_data_server = gnome3.evolution_data_server;
keepass = callPackage ../applications/misc/keepass { };
evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
exrdisplay = callPackage ../applications/graphics/exrdisplay {
fltk = fltk20;