diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers')
107 files changed, 728 insertions, 314 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 716989c7b565..f5ec3d7b6bd0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Export Skype history to HTML"; - homepage = https://github.com/Temptin/SkypeExport; + homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix index 6ff51445718b..60d4ec829cc2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "amsn-0.98.9"; src = fetchurl { - url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz; + url = "mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz"; sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Instant messaging (MSN Messenger clone)"; - homepage = http://amsn-project.net; + homepage = "http://amsn-project.net"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index a3497df1716c..ace546227b93 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { - homepage = http://www.creytiv.com/baresip.html; + homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 5094a13119f7..0b6f142f1e92 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { rev = version; owner = "sm00th"; repo = "bitlbee-discord"; - sha256 = "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f"; + sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitlbee plugin for Discord"; - homepage = https://github.com/sm00th/bitlbee-discord; + homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 84067dc5f19d..78016065610b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The Facebook protocol plugin for bitlbee"; - homepage = https://github.com/bitlbee/bitlbee-facebook; + homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 798dab2b646d..14a3319c1490 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Steam protocol plugin for BitlBee"; - homepage = https://github.com/jgeboski/bitlbee-steam; + homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 917610216aeb..cf3f2549c810 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { Messenger, AIM and ICQ. ''; - homepage = https://www.bitlbee.org/; + homepage = "https://www.bitlbee.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix index b6e13fe403db..f383daa6fd02 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -7,7 +7,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { version = "3.2.0"; src = fetchdarcs { - url = http://devel.ag-projects.com/repositories/blink-qt; + url = "http://devel.ag-projects.com/repositories/blink-qt"; rev = "release-${version}"; sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; }; @@ -59,7 +59,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://icanblink.com/; + homepage = "http://icanblink.com/"; description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 21b21e253499..14fbd4db1a00 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,47 +1,120 @@ -{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus -, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage -, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash +{ stdenv +, fetchurl +, rpmextract +, patchelf +, patchelfUnstable +, libnotify +, libuuid +, cairo +, cups +, pango +, fontconfig +, udev +, dbus +, gtk3 +, atk +, at-spi2-atk +, expat +, gdk-pixbuf +, freetype +, nspr +, glib +, nss +, libX11 +, libXrandr +, libXrender +, libXtst +, libXdamage +, libxcb +, libXcursor +, libXi +, libXext +, libXfixes +, libXft +, libXcomposite +, libXScrnSaver +, alsaLib +, pulseaudio +, makeWrapper }: stdenv.mkDerivation rec { pname = "bluejeans"; - version = "1.36.9"; + version = "2.1.0"; - src = - fetchurl { - url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm"; - sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1"; - }; + src = fetchurl { + url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; + sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd"; + }; - nativeBuildInputs = [ patchelf rpmextract ]; + nativeBuildInputs = [ rpmextract makeWrapper ]; libPath = stdenv.lib.makeLibraryPath - [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib - freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage - libXi libXext libXfixes libXcomposite alsaLib - ]; + [ + libnotify + libuuid + cairo + cups + pango + fontconfig + gtk3 + atk + at-spi2-atk + expat + gdk-pixbuf + dbus + udev.lib + freetype + nspr + glib + stdenv.cc.cc.lib + nss + libX11 + libXrandr + libXrender + libXtst + libXdamage + libxcb + libXcursor + libXi + libXext + libXfixes + libXft + libXcomposite + libXScrnSaver + alsaLib + pulseaudio + ]; + + localtime64_stub = ./localtime64_stub.c; buildCommand = '' mkdir -p $out/bin/ cd $out rpmextract $src - patchelf \ + mv usr/share share + rmdir usr + + ${patchelf}/bin/patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - opt/bluejeans/bluejeans-bin - patchelf \ - --set-rpath ${libPath} \ - opt/bluejeans/bluejeans-bin - patchelf \ --replace-needed libudev.so.0 libudev.so.1 \ - opt/bluejeans/bluejeans-bin - ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans - chmod +x $out/bin/bluejeans - patchShebangs $out + opt/BlueJeans/bluejeans-v2 + ${patchelfUnstable}/bin/patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + opt/BlueJeans/resources/BluejeansHelper + + cc $localtime64_stub -shared -o "$out"/opt/BlueJeans/liblocaltime64_stub.so + + makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \ + --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ + --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so + + patchShebangs "$out" ''; meta = with stdenv.lib; { - description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day."; + description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; license = licenses.unfree; maintainers = with maintainers; [ veprbl ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c new file mode 100644 index 000000000000..87c2fa11714c --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c @@ -0,0 +1,12 @@ +#include <stdio.h> +#include <stdlib.h> + +void *localtime64() { + fprintf(stderr, "nixpkgs: call into localtime64_r\n"); + abort(); +} + +void *localtime64_r() { + fprintf(stderr, "nixpkgs: call into localtime64_r\n"); + abort(); +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix index daffb539676f..52d8178764c5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.centerim.org/; + homepage = "http://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index e507d986510c..67c2a0db2372 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "a safe and secure chat client"; - homepage = https://coy.im/; + homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index ed30dca6cce2..5418b671633e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,13 +2,13 @@ let pname = "deltachat-electron"; - version = "1.1.0"; + version = "1.2.0"; name = "${pname}-${version}"; src = fetchurl { url = - "https://download.delta.chat/desktop/r${version}/DeltaChat-${version}.AppImage"; - sha256 = "0pbn45cyv0h3fp7s9v9q93v12ah2gj7daaq0r3z140im6zv0rkrc"; + "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; + sha256 = "Cyb34bfQEdwOA6XYZO+1Ri/2e/PRat15aUMn7IElmUI="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 9cf0032cf49f..035878b8e008 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; - homepage = https://github.com/dino/dino; + homepage = "https://github.com/dino/dino"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ mic92 qyliss ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix index 6e4a914ecb0e..8f4f16673d25 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -51,6 +51,8 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; + passthru.updateScript = ./update-discord.sh; + meta = with stdenv.lib; { description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index ab15cbb22af4..926ddeeb0483 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,5 +1,5 @@ { branch ? "stable", pkgs }: -# Generated by /maintainers/scripts/update-discord +# Generated by ./update-discord.sh let inherit (pkgs) callPackage fetchurl; in { @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.18"; + version = "0.0.19"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1v9xph7shpmabwysbc08qqlkydzgsir8rwarrjf01xmpcpyia17g"; + sha256 = "0wixmm16qsmgbr0l9144vl5pc3s2p4jqhl7cnc6kmgy1y4ig56ib"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.102"; + version = "0.0.103"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1zl53vprkwbkfn3v0lddpp1swignqjxksi4qxl5zqj7482j372a4"; + sha256 = "1d95q75ak4z6wkxlgcmkl7yk20gl7zf568b0xslz42hwx032fn4z"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh new file mode 100755 index 000000000000..34c1574c65aa --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# script to generate ./default.nix + +set -e +exec >"${BASH_SOURCE%/*}/default.nix" + +cat <<EOF +{ branch ? "stable", pkgs }: +# Generated by ./update-discord.sh +let + inherit (pkgs) callPackage fetchurl; +in { +EOF + +for branch in "" ptb canary; do + url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=${url##https://dl*.discordapp.net/apps/linux/} + version=${version%%/*.tar.gz} + echo " ${branch:-stable} = callPackage ./base.nix rec {" + echo " pname = \"discord${branch:+-}${branch}\";" + case $branch in + "") suffix="" ;; + ptb) suffix="PTB" ;; + canary) suffix="Canary" ;; + esac + echo " binaryName = \"Discord${suffix}\";" + echo " desktopName = \"Discord${suffix:+ }${suffix}\";" + echo " version = \"${version}\";" + echo " src = fetchurl {" + echo " url = \"${url//${version}/\$\{version\}}\";" + echo " sha256 = \"$(nix-prefetch-url "$url")\";" + echo " };" + echo " };" +done + +echo "}.\${branch}" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 896ca4f38a61..05767d1a9cd6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { python3 rustc wrapGAppsHook + glib ]; buildInputs = [ @@ -79,9 +80,8 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Matrix group messaging app"; - homepage = https://gitlab.gnome.org/GNOME/fractal; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } - diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index 605550beb50e..0c5090574fa6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = https://meetfranz.com; + homepage = "https://meetfranz.com"; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = ["x86_64-linux"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1fd8c47a99c2..b2be635728d7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = { - homepage = http://gajim.org/; + homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin aszlig abbradar ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 27790c2c9e08..2962d190d369 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,21 +1,34 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, makeDesktopItem }: buildGoModule rec { pname = "gomuks"; - version = "2020-02-19"; + version = "2020-03-20"; goPackagePath = "maunium.net/go/gomuks"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "702592bf89dfcf1ec382c0a09d99318bce7a3943"; - sha256 = "0g638q8ypkp6dbfy1s4hz798cpkld301f914il3yd70yf05vvysc"; + rev = "bce30e32a049b3ee76081c8d3881a3820b0e7341"; + sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs"; }; - modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4"; + modSha256 = "10w0bjhnf6bbqx5jbgfv2jxxyqswzx25p64kkjmvh5qamjzpbjz2"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + cp -r ${ + makeDesktopItem { + name = "net.maunium.gomuks.desktop"; + exec = "@out@/bin/gomuks"; + terminal = "true"; + desktopName = "Gomuks"; + genericName = "Matrix client"; + categories = "Network;Chat"; + comment = meta.description; + } + }/* $out/ + substituteAllInPlace $out/share/applications/* + ''; meta = with stdenv.lib; { homepage = "https://maunium.net/go/gomuks/"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 3e16a58f54bb..0661e6d7525e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtmess-0.97"; src = fetchurl { - url = mirror://sourceforge/gtmess/gtmess-0.97.tar.gz; + url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz"; sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; - homepage = http://gtmess.sourceforge.net/; + homepage = "http://gtmess.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 47854683e0ed..7213332a549a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop client for HipChat services"; - homepage = http://www.hipchat.com; + homepage = "http://www.hipchat.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index 169ddf65b29c..92857aa1a667 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "2019-08-08"; + version = "unstable-2020-03-22"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; - sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; + rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; + sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; }; buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv - erm_xmpp tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib hex uutf + ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving + erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name + ocaml_lwt otr astring ptime mtime notty sexplib hex uutf + dns-client base64 ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; @@ -24,8 +25,8 @@ stdenv.mkDerivation { inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { - homepage = https://github.com/hannesm/jackline; - description = "Terminal-based XMPP client in OCaml"; + homepage = "https://github.com/hannesm/jackline"; + description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix new file mode 100644 index 000000000000..7afe273599f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchurl +, appimageTools +, makeWrapper +, electron_8 +}: + +stdenv.mkDerivation rec { + pname = "jitsi-meet-electron"; + version = "2.0.2"; + + src = fetchurl { + url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; + sha256 = "04y3qn2clvsfiyp9s6ib09mfxspv3kpr9248sda8s09n1cm0jpps"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/jitsi-meet.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + ''; + + meta = with stdenv.lib; { + description = "Jitsi Meet desktop application powered by Electron"; + homepage = "https://github.com/jitsi/jitsi-meet-electron"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 7e01f97fe0df..13013dc4c753 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jitsi.org/; + homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index b155f3129642..0d97fcbbf511 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,61 +1,238 @@ -{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp -, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp -, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake -, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, mbedtls -, python, graphviz, belcard, bcg729 -, withGui ? true +{ bcg729 +, bctoolbox +, bcunit +, belcard +, belle-sip +, belr +, bzrtp +, cairo +, cmake +, cyrus_sasl +, fetchFromGitLab +, fetchurl +, ffmpeg +, gdk-pixbuf +, glib +, gnused +, graphviz +, gtk2 +, intltool +, lib +, libexosip +, liblinphone +, libmatroska +, libnotify +, libosip +, libsoup +, libupnp +, libX11 +, libxml2 +, makeWrapper +, mbedtls +, mediastreamer +, mediastreamer-openh264 +, mkDerivation +, openldap +, ortp +, pango +, pkgconfig +, python +, qtbase +, qtgraphicaleffects +, qtquickcontrols2 +, qttranslations +, readline +, speex +, sqlite +, stdenv +, udev +, zlib + # For Minizip 2.2.7: +, fetchFromGitHub +, libbsd }: +let + # Linphone Desktop requires Minizip 2.2.7. Nixpkgs contains a very old version + # from the time when it was part of zlib. The most recent release of Minizip + # is currently 2.9.2 but Linphone Desktop didn't work with that. So, even if + # we added most recent Minizip version to nixpkgs, probably Minizip 2.2.7 is + # only needed here and we shouldn't add this semi-old version to + # all-packages.nix. Therefore, just define it here locally. + minizip2 = stdenv.mkDerivation rec { + pname = "minizip"; + version = "2.2.7"; -stdenv.mkDerivation rec { - pname = "linphone"; - version = "3.12.0"; + disabled = stdenv.isAarch32; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitHub { + owner = "nmoinvaz"; + repo = pname; + rev = version; + sha256 = "1a88v1gjlflsd17mlrgxh420rpa38q0d17yh9q8j1zzqfrd1azch"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + + buildInputs = [ + zlib + libbsd # required in 2.2.7 but not in 2.9.2? + ]; + + meta = with stdenv.lib; { + description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; + homepage = "https://github.com/nmoinvaz/minizip"; + license = licenses.zlib; + platforms = platforms.unix; + }; + }; +in +mkDerivation rec { + pname = "linphone-desktop"; + # Latest release is 4.1.1 old and doesn't build with the latest releases of + # some of the dependencies so let's use the latest commit. + version = "unstable-2020-03-06"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; + rev = "971997e162558d37051f89c9c34bbc240135f704"; + sha256 = "02ji4r8bpcm2kyisn9d3054m026l33g2574i1ag1cmb2dz2p8i1c"; }; - cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ]; + # Without this patch, the build fails with: + # + # No rule to make target + # 'minizip_OUTPUT/nix/store/...linphone-desktop.../lib/libminizip.so', + # + # So, the makefile tries to use a full absolute path to the library but does + # it incorrectly. As we have installed Minizip properly, it's sufficient to + # just use "minizip" and the library is found automatically. If this patched + # target_link_libraries line was removed entirely, the build would fail at the + # very end when linking minizip. + patches = [ + ./fix_minizip_linking.patch + ]; + # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 postPatch = '' - touch coreapi/liblinphone_gitversion.h + substituteInPlace src/app/AppController.cpp \ + --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" ''; + # TODO: After linphone-desktop and liblinphone split into separate packages, + # there might be some build inputs here that aren't needed for + # linphone-desktop. buildInputs = [ - readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 - mbedtls libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska gdk-pixbuf glib cairo pango bzrtp belcard bcg729 + bcg729 + bctoolbox + belcard + belle-sip + belr + bzrtp + cairo + cyrus_sasl + ffmpeg + gdk-pixbuf + glib + gtk2 + libX11 + libexosip + liblinphone + libmatroska + libnotify + libosip + libsoup + libupnp + libxml2 + mbedtls + mediastreamer + mediastreamer-openh264 + minizip2 + openldap + ortp + pango + qtbase + qtgraphicaleffects + qtquickcontrols2 + qttranslations + readline + speex + sqlite + udev + zlib ]; nativeBuildInputs = [ - intltool pkgconfig makeWrapper cmake bcunit doxygen graphviz - (python.withPackages (ps: [ ps.pystache ps.six ])) + bcunit + cmake + gnused + graphviz + intltool + makeWrapper + pkgconfig ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error" - "-I${glib.dev}/include/glib-2.0" - "-I${glib.out}/lib/glib-2.0/include" - "-I${gtk2.dev}/include/gtk-2.0/" - "-I${cairo.dev}/include/cairo" - "-I${pango.dev}/include/pango-1.0" - "-I${gtk2}/lib/gtk-2.0/include" - "-DLIBLINPHONE_GIT_VERSION=\"v${version}\"" + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" + "-DMINIZIP_LIBRARIES=minizip" ]; - postInstall = '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins - done + # The default install phase fails because the paths are somehow messed up in + # the makefiles. The errors were like: + # + # CMake Error at cmake_builder/linphone_package/cmake_install.cmake:49 (file): + # file INSTALL cannot find + # "/build/linphone-desktop-.../build/linphone-sdk/desktop//nix/store/.../bin": + # No such file or directory. + # + # If someone is able to figure out how to fix that, great. For now, just + # trying to pick all the relevant files to the output. + # + # Also, the exec path in linphone.desktop file remains invalid, pointing to + # the build directory, after the whole nix build process. So, let's use sed to + # manually fix that path. + # + # In order to find mediastreamer plugins, mediastreamer package was patched to + # support an environment variable pointing to the plugin directory. Set that + # environment variable by wrapping the Linphone executable. + # + # Also, some grammar files needed to be copied too from some dependencies. I + # suppose if one define a dependency in such a way that its share directory is + # found, then this copying would be unnecessary. These missing grammar files + # were discovered when linphone crashed at startup and it was run with + # --verbose flag. Instead of actually copying these files, create symlinks. + # + # It is quite likely that there are some other files still missing and + # Linphone will randomly crash when it tries to access those files. Then, + # those just need to be copied manually below. + installPhase = '' + mkdir -p $out/bin + cp linphone $out/bin/ + wrapProgram $out/bin/linphone \ + --set MEDIASTREAMER_PLUGINS_DIR \ + ${mediastreamer-openh264}/lib/mediastreamer/plugins + mkdir -p $out/share/applications + sed -i "s@/build/.*/OUTPUT/bin@$out/bin@" linphone.desktop + cp linphone.desktop $out/share/applications/ + cp -r ../assets/icons $out/share/ + mkdir -p $out/share/belr/grammars + ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ + mkdir -p $out/share/linphone + ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ ''; - meta = with stdenv.lib; { - homepage = https://www.linphone.org/; + meta = with lib; { + homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl2Plus; + license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch new file mode 100644 index 000000000000..bb88d0030fae --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ee77441..18ea5c27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,7 +517,7 @@ else() + target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + elseif(NOT WIN32) +- target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") ++ target_link_libraries(${TARGET_NAME} "minizip") + endif() + endif()#If (LinphoneCxx_FOUND AND Minizip_FOUND) + endif()#If (LinphoneCxx_FOUND) diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix new file mode 100644 index 000000000000..97f775220229 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "matrix-dl-unstable"; + version = "2019-09-22"; + + src = fetchFromGitHub { + owner = "rubo77"; + repo = "matrix-dl"; + rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69"; + sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; + }; + + propagatedBuildInputs = with python3Packages; [ + matrix-client + ]; + + meta = with lib; { + description = "Download backlogs from Matrix as raw text"; + homepage = src.meta.homepage; + license = licenses.gpl1Plus; + maintainers = with maintainers; [ aw ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix index 012ad195a71b..577619dcc04e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix @@ -784,7 +784,7 @@ let version = "2.3.0"; src = fetchurl { name = "olm-2.3.0.tar.gz"; - url = https://packages.matrix.org/npm/olm/olm-2.3.0.tgz; + url = "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz"; sha256 = "1f0f037a025a44509646cb849ded7c1a1f55e7bfed240fad19676c002fcd953a"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index dbfc87b8e8d4..0a41c9666b68 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -90,7 +90,7 @@ in meta = with stdenv.lib; { description = "Mattermost Desktop client"; - homepage = https://about.mattermost.com/; + homepage = "https://about.mattermost.com/"; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index f41111237114..98b326820b9f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://mcabber.com/; + homepage = "http://mcabber.com/"; description = "Small Jabber console client"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 7d2037d16a77..5c86157f5023 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible Twitter client"; - homepage = https://mikutter.hachune.net; + homepage = "https://mikutter.hachune.net"; platforms = ruby.meta.platforms; license = licenses.mit; broken = true; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index 7122a509215d..3bdfcbfe7d1d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -15,7 +15,7 @@ buildGoPackage { meta = { description = "A file system based matrix client"; - homepage = https://gitlab.com/meutraa/mm; + homepage = "https://gitlab.com/meutraa/mm"; license = stdenv.lib.licenses.isc; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index f214f7221438..1938bae4f74c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; - homepage = https://github.com/Nheko-Reborn/nheko; + homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.unix; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 3b3b0c2fd661..e3595e07a788 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Perl Console Twitter Client"; - homepage = http://oysttyer.github.io/; + homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; license = with licenses; [ ffsl ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 079fc7d57fb1..7c2150a584fe 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-carbons"; - version = "0.1.3"; + version = "0.2.2"; src = fetchFromGitHub { owner = "gkdr"; repo = "carbons"; rev = "v${version}"; - sha256 = "05hcqvsirb7gnpfcszsrgal5q7dajl2wdi2dy7c41zgl377syavw"; + sha256 = "1aq9bwgpmbwrigq6ywf0pjkngqcm0qxncygaj1fi57npjhcjs6ln"; }; makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/carbons; + homepage = "https://github.com/gkdr/carbons"; description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 452149443096..eccb8de31e59 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { name = "pidgin-msn-pecan-0.1.4"; src = fetchurl { - url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2; + url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2"; sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; }; meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; - homepage = https://github.com/felipec/msn-pecan; + homepage = "https://github.com/felipec/msn-pecan"; platforms = stdenv.lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 9f5c246ede63..bdc16d101f55 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = https://otr.cypherpunks.ca/; + homepage = "https://otr.cypherpunks.ca/"; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index bfd4b1abd5e5..1fd248e0c89d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/pidgin-latex/; + homepage = "https://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 3555e5a7197b..13e165ad7a13 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://github.com/dreadatour/pidgin-mra; + homepage = "https://github.com/dreadatour/pidgin-mra"; description = "Mail.ru Agent plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 6d527f3a7e46..067a71a93dd5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/pidgin-opensteamworks; + homepage = "https://github.com/EionRobb/pidgin-opensteamworks"; description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index ff065e7e2ce3..bf9979c19f25 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ xosd pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/mbroemme/pidgin-osd; + homepage = "https://github.com/mbroemme/pidgin-osd"; description = "Plugin for Pidgin which implements on-screen display via libxosd"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index c418b2e992a8..cae84c054e89 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/skype4pidgin; + homepage = "https://github.com/EionRobb/skype4pidgin"; description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 7302ba89a715..463b6326b5a2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/; + homepage = "http://devel.kondorgulasch.de/pidgin-xmpp-receipts/"; description = "Message delivery receipts (XEP-0184) Pidgin plugin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 6695f8cb69b8..0322005ae935 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/purple-discord; + homepage = "https://github.com/EionRobb/purple-discord"; description = "Discord plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 5d2292b50ad0..204d99f6d7ab 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://bitbucket.org/EionRobb/purple-hangouts; + homepage = "https://bitbucket.org/EionRobb/purple-hangouts"; description = "Native Hangouts support for pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index e488ae73be00..0a6aa1a133d6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/lurch; + homepage = "https://github.com/gkdr/lurch"; description = "XEP-0384: OMEMO Encryption for libpurple"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index e9a0812e925b..999235314fe6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/purple-matrix; + homepage = "https://github.com/matrix-org/purple-matrix"; description = "Matrix support for Pidgin / libpurple"; license = licenses.gpl2; maintainers = with maintainers; [ symphorien ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 8022d32a081a..6739befbfea4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin intltool python ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/rekkanoryo/purple-plugin-pack; + homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; description = "Plugin pack for Pidgin 2.x"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 10973345dec9..7d7abbd1eed6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/dylex/slack-libpurple; + homepage = "https://github.com/dylex/slack-libpurple"; description = "Slack plugin for Pidgin"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index edb4ca3c3495..76b242659e7a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; meta = { - homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; + homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; description = "Vk (russian social network) plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 83904531753b..3277e12ec086 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/Junker/purple-xmpp-http-upload; + homepage = "https://github.com/Junker/purple-xmpp-http-upload"; description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 6657ff96b11f..253d2ddfe24a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { - homepage = https://github.com/novas0x2a/skype4pidgin; + homepage = "https://github.com/novas0x2a/skype4pidgin"; license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index c38ff8f454e9..38424ca25979 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/majn/telegram-purple; + homepage = "https://github.com/majn/telegram-purple"; description = "Telegram for Pidgin / libpurple"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 41f205514e76..de48ee26a6ed 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/jin-eld/tox-prpl; + homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index 8f86256069ce..f576f2ad9c3e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/dm0-/window_merge; + homepage = "https://github.com/dm0-/window_merge"; description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 71168e1a692c..369ae0693246 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -67,7 +67,7 @@ let unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; - homepage = http://pidgin.im; + homepage = "http://pidgin.im"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix index 31c9fb4e7c3f..f7238419b539 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { meta = with lib; { description = "Free console XMPP client"; - homepage = https://poez.io; + homepage = "https://poez.io"; license = licenses.mit; maintainers = [ maintainers.lsix ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix index f6c1aa14e0ff..86e760d497ce 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = http://www.profanity.im/; + homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 111f4e728e78..d76b8dd206e4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://bitmessage.org/; + homepage = "https://bitmessage.org/"; description = "The official Bitmessage client"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index a78e5d1c2d12..e3fc384f0f08 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -43,7 +43,7 @@ in mkDerivation { meta = with lib; { description = "Qt Tox client"; - homepage = https://tox.chat; + homepage = "https://tox.chat"; license = licenses.gpl3; maintainers = with maintainers; [ akaWolf peterhoeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 757551c70740..ec6a497bde92 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,7 +1,7 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 -, gnome3 +, libsecret }: let @@ -16,7 +16,7 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library gnome3.libsecret ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 71102e7ed776..1237892ef64c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; + homepage = "http://rambox.pro"; license = licenses.mit; maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index df4675b04497..16c96a86a412 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.2.2"; + version = "1.3.1"; 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 = "1zzlfk86gzg20qapqz9s8p9vmak8vj1smkwn9yrzs2yisfqh0gpc"; + sha256 = "1cy4h2yzrpr3gxd16p4323w06i67d82jjlyx737c3ngzw7aahmq1"; }; installPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Messaging and emailing app that combines common web applications into one"; - homepage = https://rambox.pro; + homepage = "https://rambox.pro"; license = licenses.unfree; maintainers = with maintainers; [ chrisaw ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix index 3768ecd137fb..212ba3a31a4b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "FIFO based tox client"; - homepage = http://ratox.2f30.org/; + homepage = "http://ratox.2f30.org/"; license = licenses.isc; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 96ce9c32a7d6..01295697ad3a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; - homepage = https://ricochet.im; + homepage = "https://ricochet.im"; license = licenses.bsd3; maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 97c00924d6cf..55624643a018 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -44,7 +44,7 @@ let ]); src = fetchgit { - url = https://gitlab.savoirfairelinux.com/ring/ring-daemon.git; + url = "https://gitlab.savoirfairelinux.com/ring/ring-daemon.git"; rev = "006b8dc7be08fe9beb68709af71004e7bc1ceb5c"; sha256 = "0ih9g0rismrhx6nqcy3jqfbcs166grg0shnfmrnmykl9h0xy8z47"; }; @@ -140,7 +140,7 @@ stdenv.mkDerivation { graphical user interfaces and even scripts to control the daemon from the shell. ''; - homepage = https://ring.cx; + homepage = "https://ring.cx"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index d4298a3d32f3..775b9015eb0e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { business processes. Targeting mobile, tablet, desktop, and embedded production environments. ''; - homepage = https://corvusoft.co.uk/; + homepage = "https://corvusoft.co.uk/"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 418375e80c36..390b61d8d367 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/nixpkgs/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.5.12", + "version": "1.5.15", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index b76848c2b810..e1dce803b408 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -610,11 +610,11 @@ }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minimist___minimist_1.2.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minimist___minimist_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz"; + sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63"; }; } { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 87342115e1e4..a30df623050d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,17 +1,19 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: - +{ stdenv, fetchFromGitHub +, makeWrapper, makeDesktopItem, mkYarnPackage +, electron_7, riot-web +}: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. # * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` let executableName = "riot-desktop"; - version = "1.5.13"; + version = "1.5.15"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1p2bdqq8yziv3l7kjkwqvi27a8djav7rk3lsipl7dvdjk1926941"; + sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77"; }; electron = electron_7; @@ -70,13 +72,13 @@ in mkYarnPackage rec { comment = meta.description; categories = "Network;InstantMessaging;Chat;"; extraEntries = '' - StartupWMClass="riot" + StartupWMClass=riot ''; }; meta = with stdenv.lib; { description = "A feature-rich client for Matrix.org"; - homepage = https://about.riot.im/; + homepage = "https://about.riot.im/"; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; inherit (electron.meta) platforms; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 1ff55fbb1cb0..78fc4b45f6b1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.13"; + version = "1.5.15"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0xghpf9rv7ns5aipc6n517qd9dp50rr93arvx6r36kqhkdyzbfad"; + sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7"; }; installPhase = '' @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; - homepage = http://riot.im/; + homepage = "http://riot.im/"; maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 13c7281aea7c..6b9593a24b7f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -51,7 +51,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://sat.goffi.org/; + homepage = "http://sat.goffi.org/"; description = "A multi-frontend XMPP client"; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 54959383f08e..b16659ba44cd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -13,7 +13,7 @@ in python3Packages.buildPythonPackage { meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; - homepage = https://github.com/raelgc/scudcloud; + homepage = "https://github.com/raelgc/scudcloud"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 8471f43c6dd0..a062d679f7fa 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.5"; + version = "0.6.6"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; + sha256 = "1r0w9knxa2kx5my9xgmcnhq14287ixwbqxqip5ispj78d27g4zfq"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/AsamK/signal-cli; + homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; license = licenses.gpl3; maintainers = with maintainers; [ ivan erictapen ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 903b349edfa1..7295f6c48ad6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.32.3"; # Please backport all updates to the stable channel. + version = "1.33.1"; # 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: @@ -33,7 +33,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 = "1aqk0hdgdxjznj0nbh2glvyzdq2af8xgiw3qb4k7wpjd0my28r2l"; + sha256 = "0p9ak0cmk9b77dzbw4y2xmxqg211y62n7ckggwf7bcg48wzj0jy7"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 1219440bf833..0c84e1c5c80a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ perl glib ncurses ]; meta = { - homepage = http://silcnet.org/; + homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix index cdc176be65b0..fe8b251c4048 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -10,7 +10,7 @@ # Sky is linked to the libjpeg 8 version and checks for the version number in the code. libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { src = fetchurl{ - url = https://www.ijg.org/files/jpegsrc.v8d.tar.gz; + url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; }); @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { longDescription = '' Lync & Skype for business on linux ''; - homepage = https://tel.red/; + homepage = "https://tel.red/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 8093f91feb3e..57d1ffece71a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lvorbis"; meta = { - homepage = http://atdot.ch/scr/; + homepage = "http://atdot.ch/scr/"; description = "Open source tool to record your Skype calls on Linux"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index a4852f16245c..5eda7971748f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ { 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 +, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core }: let @@ -29,6 +29,7 @@ let gnome2.GConf gdk-pixbuf gtk3 + libappindicator-gtk3 gnome3.gnome-keyring @@ -110,7 +111,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux client for skype"; - homepage = https://www.skype.com; + homepage = "https://www.skype.com"; license = licenses.unfree; maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix index d1f3e98c4ec2..c862c253c00a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Slack client for your terminal"; - homepage = https://github.com/erroneousboat/slack-term; + homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix deleted file mode 100644 index 903d8e60d6d5..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchgit }: - -stdenv.mkDerivation rec { - rev = "f760176c6e133667ce73aeecba8b0c0eb8822941"; - version = "2019-09-11"; - pname = "slack-theme-black"; - - src = fetchgit { inherit rev; - url = "https://github.com/laCour/slack-night-mode"; - sha256 = "1kx8nx7mhrabs5wxqgvy86s5smy5hw49gv6yc95yxwx6ymwpgbzj"; - }; - - dontUnpack = true; - - buildCommand = '' - mkdir $out - cp $src/css/raw/black.css $out/theme.css - ''; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 32f50b6fd638..e9a795b59cdc 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,35 +1,60 @@ -{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, -cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf, -libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils +{ stdenv +, fetchurl +, dpkg +, makeWrapper +, nodePackages +, alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gnome2 +, gtk3 +, libappindicator-gtk3 +, libnotify +, libpulseaudio +, libuuid +, libxcb +, nspr +, nss +, pango +, systemd +, xdg_utils +, xorg }: let - version = "4.2.0"; + pname = "slack"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - pname = "slack"; - sha256 = { - x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1"; - x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv"; + x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd"; + x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12"; }.${system} or throwSystem; - meta = with stdenv.lib; { description = "Desktop client for Slack"; - homepage = https://slack.com; + homepage = "https://slack.com"; license = licenses.unfree; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; linux = stdenv.mkDerivation rec { - inherit pname version meta; + inherit pname meta; + version = "4.4.0"; src = fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; inherit sha256; @@ -47,23 +72,22 @@ let expat fontconfig freetype + gdk-pixbuf glib gnome2.GConf - gdk-pixbuf gtk3 - pango + libappindicator-gtk3 libnotify + libpulseaudio + libuuid libxcb - libappindicator-gtk3 nspr nss + pango stdenv.cc.cc systemd - libuuid - libpulseaudio - - xorg.libxkbfile xorg.libX11 + xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -73,65 +97,51 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - xorg.libXScrnSaver + xorg.libxkbfile ] + ":${stdenv.cc.cc.lib}/lib64"; buildInputs = [ gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - + nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; - + dontUnpack = true; dontBuild = true; dontPatchELF = true; - + installPhase = '' # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here dpkg --fsys-tarfile $src | tar --extract rm -rf usr/share/lintian - + mkdir -p $out mv usr/* $out - + # Otherwise it looks "suspicious" chmod -R g-w $out - + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done - + # Replace the broken bin/slack symlink with a startup wrapper rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --prefix PATH : ${xdg_utils}/bin - + # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ - '' + stdenv.lib.optionalString (theme != null) '' - asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked - cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js - - var fs = require('fs'); - document.addEventListener('DOMContentLoaded', function() { - fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - let s = document.createElement('style'); - s.type = 'text/css'; - s.innerHTML = css; - document.head.appendChild(s); - }); - }); - EOF - asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar ''; }; - darwin = stdenv.mkDerivation { - inherit pname version meta; + darwin = stdenv.mkDerivation rec { + inherit pname meta; + version = "4.4.1"; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh deleted file mode 100755 index 6a15298c4e7d..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')" -latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" - -if [ ! "null" = "${latestSha}" ]; then - latestDate="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version slack-theme-black "${latestSha}" --version-key=rev - update-source-version slack-theme-black "${latestDate}" --ignore-same-hash - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix" - git add "${default_nix}" - git commit -m "slack-theme-black: ${oldVersion} -> ${latestDate}" -else - echo "slack-theme-black is already up-to-date" -fi diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix index 7a9ab4d127c4..895ad30360e9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop client for Atlassian Stride"; - homepage = https://www.stride.com/; + homepage = "https://www.stride.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix index d47b7d00af92..ce59d5746190 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./qt-5.11.patch ./scons.patch ]; - nativeBuildInputs = [ pkgconfig qttools scons ]; + nativeBuildInputs = [ pkgconfig qttools scons.py2 ]; buildInputs = [ GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://swift.im/; + homepage = "https://swift.im/"; description = "Qt XMPP client"; license = licenses.gpl3; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c2a9f4be90a2..b9835f45d27e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -101,10 +101,10 @@ stdenv.mkDerivation rec { meta = { description = "The TeamSpeak voice communication tool"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = { fullName = "Teamspeak client license"; - url = http://sales.teamspeakusa.com/licensing.php; + url = "http://sales.teamspeakusa.com/licensing.php"; free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 1cc3cf9cdd59..761d7cfcbd4b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, autoPatchelfHook }: +{ stdenv, fetchurl, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.11.0"; + version = "3.12.1"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "18hsr119dq46rvhz5sb9snn2gfxwiig37g6bfzk24x6wlga3xihq" - else "1lyazw328azi0asvgvcsxglc1saqih6ss0g8pc8f5pzqngk9p953"; + then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" + else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; }; buildInputs = [ stdenv.cc.cc ]; @@ -28,9 +28,32 @@ in stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver ''; + passthru.updateScript = writeScript "update-teampeak-server" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + + set -eu -o pipefail + + version=$( \ + curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ + | grep softwareVersion \ + | sed -E -e 's/^.*<span itemprop="softwareVersion">([^<]+)<\/span>.*$/\1/' \ + ) + + versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") + + nixFile=pkgs/applications/networking/instant-messengers/teamspeak/server.nix + + update-source-version teamspeak_server "$version" --system=i686-linux + + sed -i -e "s/version = \"$version\";/version = $versionOld;/" "$nixFile" + + update-source-version teamspeak_server "$version" --system=x86_64-linux + ''; + meta = with stdenv.lib; { description = "TeamSpeak voice communication server"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 862659fde8d9..87c70464e9b4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,32 +1,28 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, enchant, xdg_utils, ffmpeg, openalSoft, lzma -, lz4, xxHash, zlib, minizip, openssl, libtgvoip, range-v3 +, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft +, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, range-v3 }: with lib; mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.1.5"; + version = "1.2"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "1j5wn3k1mr2c39szmyzm0pf720jmbllcaj40p2ydx0p3lir1s760"; + sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant}/lib/libenchant-2.so.2"' - ''; - nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash - zlib minizip openssl enchant libtgvoip range-v3 + qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; qtWrapperArgs = [ @@ -35,8 +31,8 @@ mkDerivation rec { cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" ]; meta = { @@ -48,7 +44,7 @@ mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.linux; - homepage = https://kotatogram.github.io; + homepage = "https://kotatogram.github.io"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3d4096667983..60fd95a14761 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.21"; + version = "2.0.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1b7z68q2sb2y203nf4p6lmz72zkpi5gyv9ypqi5h99bm2j6bbyg1"; + sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index a0cc73da46d8..d81af8388aac 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 769e639314e0..6d4ff62f22a8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Patch from Gentoo that helps telepathy-haze build with more # recent versions of pidgin. (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch"; sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index af0ca1589e5a..f8e1f1f2c665 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logger service for Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index ef842275a5de..c590b6a0896d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , pkgconfig , dconf , telepathy-glib @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; }; + patches = [ + # Fix property name (new GLib is stricter) + # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939 + # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141 + (fetchpatch { + url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch"; + sha256 = "Sw+V5QcWQ5zugwTTdkwa3pqV+v5XD0OhH6xI5ymgkOU="; + }) + ]; + buildInputs = [ python3 ]; # ToDo: optional stuff missing @@ -45,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index 11845ecfb26c..dcb2c720bc62 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://matrix.org/docs/projects/client/tensor.html; + homepage = "https://matrix.org/docs/projects/client/tensor.html"; description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix index edfec97edf8a..8231f481ee0d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/prof7bit/TorChat; + homepage = "https://github.com/prof7bit/TorChat"; description = "Instant messaging application on top of the Tor network and it's location hidden services"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index 27977dae15f8..b6017277b0a5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/louipc/turses; + homepage = "https://github.com/louipc/turses"; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 5ef0d9162429..b360793e484b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight Tox client"; - homepage = https://github.com/uTox/uTox; + homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 923ce3737532..cbd32347c4e2 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://www.vacuum-im.org; + homepage = "http://www.vacuum-im.org"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index acdec1dc99c9..e53b8c7391e8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { dontPatchELF = true; meta = { - homepage = http://www.viber.com; + homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 7f2ce9553e9b..bece4e467a35 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple and Convenient Messaging App for VK"; - homepage = https://vk.com/messenger; + homepage = "https://vk.com/messenger"; license = licenses.unfree; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ceb9b4a11403..1cd2df4c7ac1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Wavebox messaging application"; - homepage = https://wavebox.io; + homepage = "https://wavebox.io"; license = licenses.mpl20; maintainers = with maintainers; [ rawkode ]; platforms = ["x86_64-linux"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index d09793733e97..d69f22f32acc 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -20,12 +20,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.15.3621"; + x86_64-darwin = "3.16.3630"; x86_64-linux = "3.16.2923"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "13sgakb3zjlvqv6d6b264fc9x99swpl7s1dmnrgc5v3pgyaklr01"; + x86_64-darwin = "1lnjn45bhd36n9xgx6xx9cggwivvkr2s6r4zai2dwg0aac1bywr5"; x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz"; }.${system} or throwSystem; @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "wrapper_macos_production%2F${version}/Wire.pkg"; + + "macos%2F${version}/Wire.pkg"; inherit sha256; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 4047eba1fbb5..52cf8e3279a0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An XMPP client with OTR support"; - homepage = https://github.com/agl/xmpp-client; + homepage = "https://github.com/agl/xmpp-client"; license = licenses.bsd3; maintainers = with maintainers; [ codsl ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index ae92e23d0bd0..ef06f26522d6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.374815.0324"; + version = "3.5.385850.0413"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1pnr00jwjjp23bbqdg5sv2s2rnciz57g1453sgi13kzpppydhzi5"; + sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index 33392af766c9..8245f5febc4c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "4.0.0"; + version = "5.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "1pni02mb5bvwx3k45vd6ga269ghdl633gjklyslai24rrhp16h9z"; + sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; name="${pname}-${version}.AppImage"; }; @@ -32,7 +32,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Desktop client for Zulip Chat"; - homepage = https://zulipchat.com; + homepage = "https://zulipchat.com"; license = licenses.asl20; maintainers = with maintainers; [ jonafato ]; platforms = [ "x86_64-linux" ]; |