From 1b929642ea24afeed455224800eadfc14e3987cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 2 Oct 2014 11:14:23 +0200 Subject: [PATCH] telepathy: 0.5.3 -> 0.8.80 --- .../telepathy/kde/0.5.3.nix | 16 ----------- .../telepathy/kde/0.8.80.nix | 14 ++++++++++ .../telepathy/kde/default.nix | 15 +++++----- .../libraries/telepathy/qt/default.nix | 6 ++-- .../libraries/telepathy/qt/farstream-0.2.diff | 28 ------------------- 5 files changed, 24 insertions(+), 55 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix delete mode 100644 pkgs/development/libraries/telepathy/qt/farstream-0.2.diff diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix deleted file mode 100644 index eb0543aa5b0f..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0nmjwbm7ycy5awwlx359889am7qbvs64gk0bd1800a9jl2lhvw56";} -{name="ktp-approver";key="approver";sha256="0n0a2abbz7xvzp3p4l6khgbhbjylppvskcyma440fmfv3j3jdc12";} -{name="ktp-auth-handler";key="auth_handler";sha256="11vfim3ck60cy22x84bz6cw0267kf884qa00nbm033kpwjbx4zr6";} -{name="ktp-call-ui";key="call_ui";sha256="0gmppn4f5a9yd3pnzga3sdwz37c7qpmx586914r64jbkii196xg4";} -{name="ktp-common-internals";key="common_internals";sha256="1lkmaym8bv5ijy7sksbihr63qify9b9vrhrikck6q23n8sk112n9";} -{name="ktp-contact-applet";key="contact_applet";sha256="0gsf1m276mhvysy30qqw1h7ssdipyyjh43jbf2lx4bb934by9wby";} -{name="ktp-contact-list";key="contact_list";sha256="19nlzs650lwmzr30lrviv0qw1xd061pdrk17cm512ldvzibc70ab";} -{name="ktp-contact-runner";key="contact_runner";sha256="0x3zkk11x9npx30w330s8n49ybqlyhgcndvqizg4sbj1lfbrmhn1";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0w90hsypzgakqx96xkf0wk2qqns6v5ji814gvc3rf9ajcwh0d024";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0sz0d1yfj35q5r1gc4m6v2c8r0cik2vzvkqfx9pqy8g97d7q1nmj";} -{name="ktp-presence-applet";key="presence_applet";sha256="081jas1vzh6nwj3w60bw3w95gpdbi74pdi9rdxv0wvra5w76s4i6";} -{name="ktp-send-file";key="send_file";sha256="19nlm4sfa0m0y856nzs3hrncbznc35zwbsxavssd9wrbb8p9cns6";} -{name="ktp-text-ui";key="text_ui";sha256="0g8114adqyvzsdm8ldhidf2gyxkv0bnky71zg70gmhkdmzcfssyn";} -{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="17bfkbxc7gfcspmjd5w6vn9a75f36qinj7illqafb7k0jqqz2nq6";} -] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix new file mode 100644 index 000000000000..6beebef1c727 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix @@ -0,0 +1,14 @@ +[ +{name="ktp-accounts-kcm";key="accounts_kcm";sha256="08b873k455jbs9vd5nsb222pr1kb7gjx3qky769654j696rad5bc";} +{name="ktp-approver";key="approver";sha256="07qsjxvcjr9i0v7g7cdx3rky1fa8aany5fyfav488kq6nc13fjb1";} +{name="ktp-auth-handler";key="auth_handler";sha256="00gq5gq7imv7rv8xivl2s1n0k39llpmd5z46rvhai76z7hp8sj4l";} +{name="ktp-call-ui";key="call_ui";sha256="1dwsq2ixci95byfg1ayy6g2zv0dbc0273r9wb395f220dgqpz7b4";} +{name="ktp-common-internals";key="common_internals";sha256="049hh045p6nccyrjvagfw183vfa857xdl96q2w1vrj6frimniz9q";} +{name="ktp-contact-list";key="contact_list";sha256="0xydyyla48y7q8pf84i12l7fx13p0gi8k4jl7nl7jxjsflzidscp";} +{name="ktp-contact-runner";key="contact_runner";sha256="1bfb772cyzrbwjkglr3bvawp44dcqr59kkgvb6irgha8w7adic3b";} +{name="ktp-desktop-applets";key="desktop_applets";sha256="150mpk7vq2w47vz2yffhj676k84fn3h8g77xklmyqm1y3f21dx01";} +{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="07jgfydhr5hh7z0wkrz6k4gh3li9nmyxhjvxcxsayxrc7gnhazja";} +{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0axjqsk1h9c71hxpcy8ls7jsb0dsmsm75wdgwx71xrdb9hpqwn9f";} +{name="ktp-send-file";key="send_file";sha256="0wiqrwhrmccx3ic0aaqlq539jcznkgsrwyn9hdizwsc8f33rxmri";} +{name="ktp-text-ui";key="text_ui";sha256="0ch6sqvj9hpx3823c1wmziqy6g9v97sj1hihbaf8z8wyb84f0wbl";} +] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index d41db2e44983..564952480f23 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs -, pkgconfigUpstream , qt_gstreamer, telepathy_glib, telepathy_logger, qjson, flex, bison }: +{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream +, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }: let pkgconfig = pkgconfigUpstream; - version = "0.5.3"; + version = "0.8.80"; manifest = import (./. + "/${version}.nix"); overrides = { @@ -13,11 +13,12 @@ let }; extraBuildInputs = { - auth_handler = [ qjson ]; - call_ui = [ qt_gstreamer telepathy_glib ]; + auth_handler = [ qjson qca2 ]; + call_ui = [ qt_gstreamer1 telepathy_glib farstream ]; contact_applet = [ kde_workspace ]; - telepathy_logger_qt = [ telepathy_logger qt_gstreamer ]; - text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ]; + telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ]; + text_ui = [ qt_gstreamer1 telepathy_logger qjson ]; + common_internals = [ telepathy_qt ]; }; extraNativeBuildInputs = { diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 4ec8c4befc69..7eab88ae0c1e 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -2,15 +2,13 @@ , telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.4"; + name = "telepathy-qt-0.9.5"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi"; + sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; }; - patches = [ ./farstream-0.2.diff ]; - nativeBuildInputs = [ cmake pkgconfig python libxslt ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff deleted file mode 100644 index 86d392fe1ac8..000000000000 --- a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake ---- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200 -+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200 -@@ -23,9 +23,9 @@ - # in the find_path() and find_library() calls - find_package(PkgConfig) - if (FARSTREAM_MIN_VERSION) -- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) -+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION}) - else (FARSTREAM_MIN_VERSION) -- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) -+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) - endif (FARSTREAM_MIN_VERSION) - set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER}) - endif (NOT WIN32) -@@ -34,10 +34,10 @@ - PATHS - ${PC_FARSTREAM_INCLUDEDIR} - ${PC_FARSTREAM_INCLUDE_DIRS} -- PATH_SUFFIXES farstream-0.1 -+ PATH_SUFFIXES farstream-0.2 - ) - --find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 -+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 - PATHS - ${PC_FARSTREAM_LIBDIR} - ${PC_FARSTREAM_LIBRARY_DIRS}