diff options
Diffstat (limited to 'pkgs')
9 files changed, 48 insertions, 12 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix new file mode 100644 index 00000000000..33a935fa7eb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib +, python, sofia_sip }: + +stdenv.mkDerivation rec { + pname = "telepathy-rakia"; + name = "${pname}-0.7.3"; + + src = fetchurl { + url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; + sha256 = "1jnxlx135c660vb1n2vpg6ci2ps0rbrp3244jgchik3g6q5vwbb4"; + }; + + buildNativeInputs = [pkgconfig libxslt python]; + buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; + + meta = { + homepage = http://telepathy.freedesktop.org; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index a5ca302d03d..02701f9f1ce 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "telepathy-salut"; - name = "${pname}-0.7.1"; + name = "${pname}-0.7.2"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0677c4j11n0symmhy52g2qzrflvxjppysscq3rh7zc3ys6h10kpi"; + sha256 = "0vahmqi78pbmsn472kijl3d4rshz07pmihxk5xkp99hvbqd4mb1f"; }; buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 7d5e7148620..b2b8ca6255b 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -2,10 +2,10 @@ , pygobject, gst_python, gupnp_igd }: stdenv.mkDerivation rec { - name = "farstream-0.1.1"; + name = "farstream-0.1.2"; src = fetchurl { url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; - sha256 = "0lmdz7ijpgrc0zbr11jp3msvz44p809scx2m56bk5l5x1xrs123v"; + sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps"; }; buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix new file mode 100644 index 00000000000..3ce49e8ffaf --- /dev/null +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, glib, openssl, pkgconfig }: + +stdenv.mkDerivation rec { + name = "sofia-sip-1.12.11"; + + src = fetchurl { + url = "mirror://sourceforge/sofia-sip/${name}.tar.gz"; + sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b"; + }; + + buildInputs = [ glib openssl ]; + buildNativeInputs = [ pkgconfig ]; +} diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a9b072d2152..a183737dc9b 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -2,12 +2,12 @@ , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: stdenv.mkDerivation rec { - name = "${pname}-0.2.2"; + name = "${pname}-0.2.3"; pname = "telepathy-farstream"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0gdcf50dz1hf22az5jqal2jlzbb1nl2cim579kv3q87b8lq9aplv"; + sha256 = "1a163gk9y3ckabm4a43lxc5a7j2s42hykbwr6r7b5mlfyqq8myx1"; }; buildInputs = [ gst_plugins_base gst_python pygobject ]; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 31301d44f49..22a6aef5c3a 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.17.5"; + name = "telepathy-glib-0.17.7"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "13gylgwgjp29zakzj5kb4h0j5zh30dsl8ch7hp3dp4nmy4vdj6h1"; + sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz"; }; propagatedBuildInputs = [dbus_glib glib python]; diff --git a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch index 78c3e6af041..bba92d408a0 100644 --- a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch +++ b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch @@ -8,7 +8,7 @@ index e2ddf03..6038011 100644 Description: GLib utility library for the Telepathy framework Version: @VERSION@ -Requires: pkg-config >= 0.21 --Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 -+Requires: pkg-config >= 0.21 dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 +-Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 ++Requires: pkg-config >= 0.21 dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 Libs: -L${libdir} -ltelepathy-glib Cflags: -I${includedir}/telepathy-1.0 diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index c23e351b4ff..a620526ff85 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -2,11 +2,11 @@ , telepathy_farsight, telepathy_glib }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.0"; + name = "telepathy-qt-0.9.1"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0v3hnvzm3k2z99rc1znxgriqvf1n7wyjdzzsld0czhbmrz9fhang"; + sha256 = "0rwyxjk6646r43mvsg01q7rfsah0ni05fa8gxzlx1zhj76db95yh"; }; buildNativeInputs = [ cmake pkgconfig python libxslt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02e711a5439..aef1055d287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4664,6 +4664,8 @@ let # optional }; + sofia_sip = callPackage ../development/libraries/sofia-sip { }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; @@ -7435,6 +7437,8 @@ let telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; + telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { }; + telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; tesseract = callPackage ../applications/graphics/tesseract { }; |