Merge pull request #32793 from jtojnar/telepathy

Telepathy updates

pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

@@ -2,11 +2,11 @@
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.18.2";
+  name = "telepathy-gabble-0.18.3";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
+    sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://telepathy.freedesktop.org;
+    homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/;
     description = "Jabber/XMPP connection manager for the Telepathy framework";
+    license = licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix

@@ -3,18 +3,20 @@
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
-  name = "${project}-0.8.0";
+  name = "${project}-0.8.2";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
     sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt 
-                  gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
+  nativeBuildInputs = [
+    makeWrapper pkgconfig intltool libxslt gobjectIntrospection
+  ];
+  buildInputs = [
+    dbus_glib libxml2 sqlite telepathy_glib
+    dbus_libs telepathy_glib.python
+  ];
 
   configureFlags = "--enable-call";
 
@@ -24,10 +26,11 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Logger service for Telepathy framework";
-    homepage = http://telepathy.freedesktop.org/wiki/Logger ;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
+    homepage = https://telepathy.freedesktop.org/components/telepathy-logger/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.gnu; # Arbitrary choice
   };
 }

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }:
+{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.16.3";
+  name = "${pname}-5.16.4";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
+    sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
   };
 
-  buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
-  # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
+  buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing
 
-  nativeBuildInputs = [ pkgconfig libxslt ];
+  nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];
 
   doCheck = true;
 
@@ -24,8 +23,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An account manager and channel dispatcher for the Telepathy framework";
-    homepage = http://telepathy.freedesktop.org/wiki/;
+    homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/;
     license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };
 }

pkgs/development/libraries/telepathy/qt/default.nix

@@ -4,51 +4,37 @@
 let
   inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.6.1";
+  name = "telepathy-qt-0.9.7";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9";
+    sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1";
   };
 
-  patches = let
-    mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash;
-    in [
-      (fetchpatch {
-        name = "gst-1.6.patch";
-        url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
-        sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
-      })
-      (fetchpatch {
-        name = "parallel-make-1.patch";
-        url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e";
-        sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw";
-      })
-      (fetchpatch {
-        name = "parallel-make-2.patch";
-        url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5";
-        sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57";
-      })
-    ];
-
   nativeBuildInputs = [ cmake pkgconfig python ];
-  propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ];
+  propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ];
+  buildInputs = [ dbus_glib ];
+  checkInputs = [ dbus_daemon dbus-python ];
 
-  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+  patches = [
+    # https://github.com/TelepathyIM/telepathy-qt/issues/25
+    (fetchpatch {
+      url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch;
+      sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh";
+    })
+  ];
 
-  cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}";
-
-  # should be removable after the next update
-  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
-
-  preBuild = ''
-    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
-  '';
+  # No point in building tests if they are not run
+  # On 0.9.7, they do not even build with QT4
+  cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
 
   enableParallelBuilding = true;
   doCheck = false; # giving up for now
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Telepathy Qt bindings";
+    homepage = https://telepathy.freedesktop.org/components/telepathy-qt/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
   };
 }