diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
12 files changed, 67 insertions, 73 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a2f9ebc83173e..2935979ebb9aa 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.16"; + version = "0.4.17"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876"; + sha256 = "106nagdyayyxj3q68bs3fsps5wnwzjh82vcmy98fp42j33q6yzny"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index ebb63967b0081..7a2c6d7c0dcab 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted , gnutls, libvpx }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "1.4.2"; diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix index 9b16404b6208d..a50779f53dd0c 100644 --- a/pkgs/applications/networking/instant-messengers/choqok/default.nix +++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "${pn}-${v}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz"; + url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz"; sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; }; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index abe9b78904f0a..f32bdf96257c6 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp"; + sha256 = "1phzfsl6cfzaga140dm8bb8q678j0qsw29cc03rw4vkcxa8kh577"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index ebb82a7826252..e7266a93350be 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell -, gstreamer, gst_plugins_base, startupnotification, gettext +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell +, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farsight2 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { inherit nss ncurses; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtkspell aspell - gstreamer gst_plugins_base startupnotification + gstreamer gst_plugins_base gst_plugins_good startupnotification libxml2 nss nspr farsight2 libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn @@ -54,6 +56,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/pidgin \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 72619e417adb8..541fb5727ced7 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv, +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, qtbase, qtsvg, qttools, qttranslations, sqlcipher }: let - revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1"; + version = "1.2.4"; + revision = "v${version}"; in stdenv.mkDerivation rec { - name = "qtox-dev-20151221"; + name = "qtox-${version}"; - src = fetchgit { - url = "https://github.com/tux3/qTox.git"; - rev = "${revision}"; - md5 = "a93a63d35e506be4b21abda0986f19e7"; + src = fetchFromGitHub { + owner = "tux3"; + repo = "qTox"; + rev = revision; + sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9"; }; buildInputs = @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" ''; configurePhase = '' diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 89487e5bf27e4..81e8d1b76a9cd 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "ricochet-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz"; - sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms"; + sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 507094f7c055f..ec188e9828437 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -1,31 +1,37 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtquick1, qtmultimedia, qtquickcontrols, qtgraphicaleffects, makeQtWrapper -, telegram-qml, libqtelegram-aseman-edition }: +{ stdenv, fetchgit +, qtbase, qtmultimedia, qtquick1, qtquickcontrols +, qtimageformats, qtgraphicaleffects +, telegram-qml, libqtelegram-aseman-edition +, gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly +, makeQtWrapper }: stdenv.mkDerivation rec { - name = "cutegram-${version}"; - version = "2.7.0-stable"; + name = "cutegram-${meta.version}"; - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "Cutegram"; - rev = "v${version}"; - sha256 = "0qhy30gb8zdrphz1b7zcnv8hmm5fd5qwlvrg7wpsh3hk5niz3zxk"; + src = fetchgit { + url = "https://github.com/Aseman-Land/Cutegram.git"; + rev = "1dbe2792fb5a1760339379907f906e236c09db84"; + sha256 = "080153bpa92jpi0zdrfajrn0yqy3jp8m4704sirbz46dv7471rzl"; }; - # TODO appindicator, for system tray plugin - buildInputs = [ qtbase qtquick1 qtmultimedia qtquickcontrols qtgraphicaleffects telegram-qml libqtelegram-aseman-edition ]; + + buildInputs = + [ qtbase qtmultimedia qtquick1 qtquickcontrols + qtimageformats qtgraphicaleffects + telegram-qml libqtelegram-aseman-edition + gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ]; nativeBuildInputs = [ makeQtWrapper ]; enableParallelBuild = true; - fixupPhase = "wrapQtProgram $out/bin/cutegram"; - configurePhase = "qmake -r PREFIX=$out"; + fixupPhase = "wrapQtProgram $out/bin/cutegram"; + meta = with stdenv.lib; { + version = "2.7.1"; description = "Telegram client forked from sigram"; homepage = "http://aseman.co/en/products/cutegram/"; license = licenses.gpl3; - maintainers = [ maintainers.profpatsch ]; + maintainers = with maintainers; [ profpatsch AndersonTorres ]; }; - } +#TODO: appindicator, for system tray plugin (by @profpatsch) diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 8166514bb3ac5..957c59b88e557 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -2,14 +2,13 @@ , qtbase, qtmultimedia, qtquick1 }: stdenv.mkDerivation rec { - name = "libqtelegram-aseman-edition-${version}"; - version = "6.0"; + name = "libqtelegram-aseman-edition-${meta.version}"; src = fetchFromGitHub { owner = "Aseman-Land"; repo = "libqtelegram-aseman-edition"; - rev = "v${version}"; - sha256 = "17hlxf43xwic8m06q3gwbxjpvz31ks6laffjw6ny98d45zfnfwra"; + rev = "v${meta.version}-stable"; + sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6"; }; buildInputs = [ qtbase qtmultimedia qtquick1 ]; @@ -25,6 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + version = "6.1"; description = "A fork of libqtelegram by Aseman, using qmake"; homepage = src.meta.homepage; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 6bf550d4766bf..aa442cbe8b2d6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -3,17 +3,16 @@ , libqtelegram-aseman-edition }: stdenv.mkDerivation rec { - name = "telegram-qml-${version}"; - version = "0.9.1-stable"; + name = "telegram-qml-${meta.version}"; src = fetchFromGitHub { owner = "Aseman-Land"; repo = "TelegramQML"; - rev = "v${version}"; - sha256 = "077j06lfr6qccqv664hn0ln023xlh5cfm50kapjc2inapxj2yqmn"; + rev = "v${meta.version}"; + sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499"; }; - buildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; + propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; enableParallelBuild = true; patchPhase = '' @@ -26,6 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + version = "0.9.2"; description = "Telegram API tools for QtQml and Qml"; homepage = src.meta.homepage; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index f9209f28cf20a..9c84e60601bbf 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -40,11 +40,7 @@ let } // removeAttrs attrs [ "name" "sha256" ]); in mkTkabber (main // { - postPatch = '' - substituteInPlace login.tcl --replace \ - "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)" - '' + optionalString (theme != null) '' + postPatch = optionalString (theme != null) '' themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@ diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 61b7e8ec5105a..55ec1560c5e5c 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,41 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: -let - - filteraudio = stdenv.mkDerivation rec { - name = "filter_audio-20150516"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "filter_audio"; - rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; - sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; - }; - - buildInputs = [ utillinux ]; - - doCheck = false; - - makeFlags = "PREFIX=$(out)"; - }; - -in stdenv.mkDerivation rec { - name = "utox-dev-20151220"; +stdenv.mkDerivation rec { + name = "utox-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GrayHatter"; repo = "uTox"; - rev = "7e2907470835746b6819d631b48dd54bc9c4de66"; + rev = "v${version}"; sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk"; }; buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype - libv4l libXrender fontconfig libXext libXft filteraudio + libv4l libXrender fontconfig libXext libXft filter-audio git libsodium ]; doCheck = false; - + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { |