diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/applications/networking/instant-messengers | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
12 files changed, 38 insertions, 177 deletions
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cc0bdf603944f..e24ac2e18317b 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchFromGitHub , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf -}: - +, automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; @@ -19,11 +17,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + buildInputs = [ guile glib loudmouth gmp libidn readline libtool - libunwind ncurses curl jansson texinfo - autoconf automake + libunwind ncurses curl jansson ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 111efb182e584..6556283089713 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake +{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: stdenv.mkDerivation rec { + generic = version: sha256: prefix: library: mkDerivation rec { pname = "quaternion"; inherit version; @@ -14,9 +14,9 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake qttools ]; postInstall = if stdenv.isDarwin then '' mkdir -p $out/Applications @@ -29,7 +29,7 @@ let meta = with lib; { description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = https://matrix.org/docs/projects/client/quaternion.html; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index ffa55a88c8ab1..9a0aab6f8ce16 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.1.4"; + version = "1.1.6"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "0vwh3km3h46bgynd10s8ijl3aj5sskzncdj14h3k7h4sibd8r71a"; + sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index edf10ed2cb428..2e9602458e7fa 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.0", + "version": "1.3.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 7400393d92bab..d245fad7bca5a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.3.0"; + version = "1.3.3"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; + sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; }; in mkYarnPackage rec { @@ -49,7 +49,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -65,7 +65,7 @@ in mkYarnPackage rec { # * category and StartupWMClass from the build.linux section of # https://github.com/vector-im/riot-web/blob/develop/package.json desktopItem = makeDesktopItem { - inherit name; + name = "riot"; exec = executableName; icon = "riot"; desktopName = "Riot"; @@ -82,7 +82,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron.meta) platforms; + inherit (electron_5.meta) platforms; }; } - diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ba0f8c48fbde9..2755d181da2b5 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.3.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; + sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index dd76063a0fa58..cbab67e5e1a5b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg -, at-spi2-atk }: +, at-spi2-atk, libuuid, at-spi2-core }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.50.0.38"; + version = "8.51.0.72"; rpath = stdenv.lib.makeLibraryPath [ alsaLib atk at-spi2-atk + at-spi2-core cairo cups curl @@ -23,6 +24,7 @@ let glib glibc libsecret + libuuid gnome2.GConf gdk-pixbuf @@ -58,7 +60,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1g0aacp4qgzp3018w1s685yr3ssqlw0z2x6ifrj01k4ig82jfkn6"; + sha256 = "1rv3jxirlfy0gvphw8cxmwmghbak5m5wj0y3bgamcvma48mzdfk3"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix deleted file mode 100644 index 77a8d57f8b6ff..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchgit -, qtbase, qtmultimedia, qtquick1, qtquickcontrols -, qtimageformats, qtgraphicaleffects, qtwebkit -, telegram-qml, libqtelegram-aseman-edition -, gst_all_1 -, makeWrapper, qmake }: - -stdenv.mkDerivation rec { - name = "cutegram-${meta.version}"; - - src = fetchgit { - url = "https://github.com/Aseman-Land/Cutegram.git"; - rev = "1dbe2792fb5a1760339379907f906e236c09db84"; - sha256 = "146vd3ri05da2asxjjxibnqmb685lgwl2kaz7mwb7ja7vi4149f0"; - }; - - buildInputs = - [ qtbase qtmultimedia qtquick1 qtquickcontrols - qtimageformats qtgraphicaleffects qtwebkit - telegram-qml libqtelegram-aseman-edition - ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - - - enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper qmake ]; - - fixupPhase = '' - wrapProgram $out/bin/cutegram \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - 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 = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} -#TODO: appindicator, for system tray plugin 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 deleted file mode 100644 index 49368da708e9a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake }: - -stdenv.mkDerivation rec { - name = "libqtelegram-aseman-edition-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "libqtelegram-aseman-edition"; - rev = "v${meta.version}-stable"; - sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6"; - }; - - buildInputs = [ qtbase qtmultimedia qtquick1 ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" - substituteInPlace libqtelegram-ae.pro --replace "/\$\$LIB_PATH" "" - ''; - - meta = with stdenv.lib; { - version = "6.1"; - description = "A fork of libqtelegram by Aseman, using qmake"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ce7f47fe4ff76..3d88e50221d6b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch -, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -8,14 +8,16 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.0"; + version = "1.8.2"; + # Note: Due to our strong dependency on the Arch patches it's probably best + # to also wait for the Arch update (especially if the patches don't apply). # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy"; + sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j"; fetchSubmodules = true; }; @@ -31,6 +33,8 @@ mkDerivation rec { sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v"; }; + # Note: It would be best if someone could get as many patches upstream as + # possible (we currently depend a lot on custom patches...). patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/no-gtk2.patch" @@ -45,12 +49,12 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; - # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; dontWrapQtApps = true; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ]; + buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 @@ -157,6 +161,10 @@ mkDerivation rec { meta = { description = "Telegram Desktop messaging app"; + longDescription = '' + Desktop client for the Telegram messenger, based on the Telegram API and + the MTProto secure protocol. + ''; license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix deleted file mode 100644 index c0b1de893c73a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchgit, libconfig, libevent, openssl -, readline, zlib, lua5_2, python, pkgconfig, jansson -, runtimeShell -}: - -stdenv.mkDerivation rec { - name = "telegram-cli-2016-03-23"; - - src = fetchgit { - url = "https://github.com/vysheng/tg.git"; - sha256 = "07sss5cnw2ygd7mp8f5532lmj7qm6ywqf4cjaq5g13i8igzqzwzj"; - rev = "6547c0b21b977b327b3c5e8142963f4bc246187a"; - }; - - buildInputs = [ - libconfig libevent openssl readline zlib - lua5_2 python pkgconfig jansson - ]; - installPhase = '' - mkdir -p $out/bin - cp ./bin/telegram-cli $out/bin/telegram-wo-key - cp ./tg-server.pub $out/ - cat > $out/bin/telegram-cli <<EOF - #!${runtimeShell} - $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" - EOF - chmod +x $out/bin/telegram-cli - ''; - - meta = { - description = "Command-line interface for Telegram messenger"; - homepage = https://telegram.org/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix deleted file mode 100644 index 0efa7bee1d0ba..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake -, libqtelegram-aseman-edition }: - -stdenv.mkDerivation rec { - name = "telegram-qml-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "TelegramQML"; - rev = "v${meta.version}"; - sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499"; - }; - - propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" - substituteInPlace telegramqml.pro --replace "INSTALL_HEADERS_PREFIX/telegramqml" "INSTALL_HEADERS_PREFIX" - ''; - - qmakeFlags = [ "BUILD_MODE+=lib" ]; - - meta = with stdenv.lib; { - version = "0.9.2"; - description = "Telegram API tools for QtQml and Qml"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} |