diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
commit | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (patch) | |
tree | 29bdc77cfbcf01a583c7600f9df3426abe5f1e6d /pkgs/applications/networking/instant-messengers | |
parent | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (diff) | |
parent | 8b57a7573c04cc02b86228bc263afe16bc3fe748 (diff) | |
download | nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.gz nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.bz2 nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.lz nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.xz nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.zst nixlib-6c8aed6391a5e9f69cb59792aed58c5f33650275.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
4 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 16fb1bbab1ed..5ca28fca7a79 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; license = licenses.gpl2; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7575301cd30b..9f1089d7889d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -58,7 +58,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.27.3"; # Please backport all updates to the stable channel. + version = "1.27.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1c9arwnwa0lirvkwm0rfknabqn5gkznihxl1p2m6j7cs7hwhhsn2"; + sha256 = "1aza1s70xzx9qkv7b5mpfi4zgdn5dq3rl03lx3jixij3x3pxg5sj"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0aec91c853ac..e57ff881af34 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,14 +1,14 @@ { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch , pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.13"; + version = "1.8.15"; # 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 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz"; + sha256 = "03173y2nlkf757llgpia8p2dkkwsjra7b6qm5nhmkcwcm8kmsvyy"; fetchSubmodules = true; }; @@ -59,7 +59,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 0bc9b3124ee9..6513c6324a61 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; + broken = true; }; } |