diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:41 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:41 +0200 |
commit | b9c5f849a479345f3659f89d0009c056639692b3 (patch) | |
tree | c5bccc2485a74ccd877e6822554b700fc4a14b24 /pkgs/applications/networking/instant-messengers | |
parent | 6eb4cb59c1204fd5e67366bb4ab48e673127a85e (diff) | |
parent | b3fcd9375d89060979ce67d13c6714ebc3e1c002 (diff) | |
download | nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar.gz nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar.bz2 nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar.lz nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar.xz nixlib-b9c5f849a479345f3659f89d0009c056639692b3.tar.zst nixlib-b9c5f849a479345f3659f89d0009c056639692b3.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
7 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 310d419718fe..8a15a3bdd85e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 5b3e09440a63..6180f531f47f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin gmime libxml2 nss ]; enableParallelBuilding = true; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; meta = with stdenv.lib; { 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 cfc38fb4ae7e..d305fade0382 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.4.0", + "version": "1.4.1", "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 885e90a98c44..7b5bb1e04f33 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.4.0"; + version = "1.4.1"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa"; + sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl"; }; in yarn2nix-moretea.mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index d0ee71b9969c..1b9b34ed4aaa 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.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk"; + sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 26b858aa3b86..9319d8b0f5b9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -8,7 +8,7 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.8"; + version = "1.8.9"; # 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). @@ -17,7 +17,7 @@ mkDerivation rec { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv"; + sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 933badccf631..5a84f9be96dc 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.291715.0908"; + version = "3.0.301026.0930"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f"; + sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar"; }; }; |