diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/applications/networking/instant-messengers | |
parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
download | nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
4 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index f831ac0847ce..bcabdf43cd22 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 929277996c5e..cf9558b4b955 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b6e9c9210251..7c630e522afe 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -37,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + + inherit (rambox-bare.meta // { + platforms = [ "i686-linux" "x86_64-linux" ]; + }); } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8b4c951abaf..00e94234405c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "009bcy90dvwiizya387fqrh3a8l0czgs4wnddxndy9gd477sn704"; + sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; }; phases = [ "unpackPhase" "installPhase" ]; |