diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/networking/instant-messengers | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers')
61 files changed, 1014 insertions, 635 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix deleted file mode 100644 index 60d4ec829cc2..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}: - -stdenv.mkDerivation { - name = "amsn-0.98.9"; - src = fetchurl { - url = "mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz"; - sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; - }; - - configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--enable-static" - ]; - - buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; - - postInstall = '' - wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin - ''; - - meta = { - description = "Instant messaging (MSN Messenger clone)"; - 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 37d8adceae1c..c3479d1ee698 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 -, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx +, gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { version = "0.6.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid - ccache libvpx + libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" 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 07e7b74a43c2..1a8110acacb9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "bitlbee"; repo = "bitlbee-facebook"; - sha256 = "11068zhb1v55b1x0nhjc4f3p0glccxpcyk5c1630hfdzkj7vyqhn"; + sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index f8bcdc4bef7c..5e3f0bdb5d63 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -39,11 +39,12 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.4.0"; + version = "2.19.0"; + buildNumber = "61"; src = fetchurl { - url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; - sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0"; + url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; + sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix index a262b0487464..d3633e2245ff 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cordless"; - version = "2020-08-30"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "Bios-Marcel"; repo = pname; rev = version; - sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; + sha256 = "0avf09b73fs3wpb4fzmm6ka595aanfvp95m6xj1ccxvq8ciwpqcw"; }; subPackages = [ "." ]; - vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; + vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y"; meta = with stdenv.lib; { homepage = "https://github.com/Bios-Marcel/cordless"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix index 0ee84dae356e..46c0cbef669e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -4,7 +4,7 @@ , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3 +, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu }: let @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver - libappindicator-gtk3 + libappindicator-gtk3 libdbusmenu ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 649e3b673df9..570fe463c5ae 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,30 +7,30 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0qrzvc8cp8azb1b2wb5i4jh9smjfw5rxiw08bfqm8p3v74ycvwk8"; + sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y"; }; }; ptb = callPackage ./base.nix rec { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j"; + sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.112"; + version = "0.0.116"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1ibw3lsk1060g6b79v78292q45ayqj3izrs3ilvg4gfwmfxmm1a0"; + sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 8d2632420f75..7a735e59dcbd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,12 +2,12 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.7", + "version": "1.7.16", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { "type": "git", - "url": "https://github.com/vector-im/riot-desktop" + "url": "https://github.com/vector-im/element-desktop" }, "license": "Apache-2.0", "files": [], @@ -21,7 +21,7 @@ "build32": "electron-builder --ia32", "build64": "electron-builder --x64", "build": "electron-builder", - "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", + "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild", "docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build": "scripts/in-docker.sh yarn run build", "docker:install": "scripts/in-docker.sh yarn install", @@ -34,7 +34,8 @@ "electron-store": "^2.0.0", "electron-window-state": "^4.1.0", "minimist": "^1.2.3", - "png-to-ico": "^1.0.2" + "png-to-ico": "^2.1.0", + "request": "^2.88.2" }, "devDependencies": { "asar": "^2.0.1", @@ -56,12 +57,12 @@ "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^2.1.0", + "matrix-seshat": "^2.2.1", "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "9.1.2", + "electronVersion": "10.1.6", "files": [ "package.json", { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index f0175f2febf8..08c3d2554c9a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -98,6 +98,14 @@ }; } { + name = "_babel_runtime___runtime_7.11.2.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; + sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; + }; + } + { name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { name = "_babel_template___template_7.10.4.tgz"; @@ -138,6 +146,254 @@ }; } { + name = "_jimp_bmp___bmp_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_bmp___bmp_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.8.tgz"; + sha1 = "5933ab8fb359889bec380b0f7802163374933624"; + }; + } + { + name = "_jimp_core___core_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_core___core_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.8.tgz"; + sha1 = "b2b74263a80559c0ee244e0f2d1052b36a358b85"; + }; + } + { + name = "_jimp_custom___custom_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_custom___custom_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.8.tgz"; + sha1 = "1e9d904b1b05aa22b00b899baba2be7c0704a5d1"; + }; + } + { + name = "_jimp_gif___gif_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_gif___gif_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.8.tgz"; + sha1 = "513aff511634c338d1ab33a7bba1ba3412220b5b"; + }; + } + { + name = "_jimp_jpeg___jpeg_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_jpeg___jpeg_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.8.tgz"; + sha1 = "8c086f69d0e8c46e43a7db9725576edc30925cb1"; + }; + } + { + name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz"; + sha1 = "916bf6f261e6a91dbecca0ca866b8d9cba563753"; + }; + } + { + name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz"; + sha1 = "00055d54b90532b7951dae377b3e40352c187f07"; + }; + } + { + name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz"; + sha1 = "5de8735f32f931d9160d0f5211e9aab6413a1d4b"; + }; + } + { + name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.8.tgz"; + sha1 = "3c633f22955a4f5013025e9e9e78a267ac4c3a88"; + }; + } + { + name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz"; + sha1 = "f892fb7fc87134a47b37281f0ff17d608f3e51af"; + }; + } + { + name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz"; + sha1 = "37474b19027ac0155100b71ca17266aab19e50fc"; + }; + } + { + name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz"; + sha1 = "2308696597a8bcb528d09eeebbbadb22248e7c1c"; + }; + } + { + name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz"; + sha1 = "00331047039cb2d0d9d5f7c3d8ce542e07eea791"; + }; + } + { + name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz"; + sha1 = "9cca12997f2917f27d5681275b32affdb3083450"; + }; + } + { + name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz"; + sha1 = "e3f5f616ec06a9ef99aa268446f0096eac863437"; + }; + } + { + name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz"; + sha1 = "c00559a8543a684c7cff4d1128b7152e598fbb1c"; + }; + } + { + name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz"; + sha1 = "d1666167ce1b947b65db5093bb9a00d319bcfe4d"; + }; + } + { + name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz"; + sha1 = "41d6e87faf01a5d8fe7554e322d2aad25f596ab1"; + }; + } + { + name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz"; + sha1 = "fe92132db1a2b9f7718226bc3c37794dd148ce36"; + }; + } + { + name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz"; + sha1 = "05646aa15b6a789c4ba447edcad77c83c1d51f16"; + }; + } + { + name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.8.tgz"; + sha1 = "808f723176d0a57186d7558290c7e53a7a8bf812"; + }; + } + { + name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz"; + sha1 = "eef750b77f1cc06e8bcf9b390860c95c489dcc02"; + }; + } + { + name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz"; + sha1 = "5eba01f75a397777c6782b7999c9ac6c7ed8a411"; + }; + } + { + name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz"; + sha1 = "c875d5e0b377b15b8b398ee402f45e3fc43fea40"; + }; + } + { + name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz"; + sha1 = "ca2d18afa29a1027b77b3e1fb2ce7d4e073a7170"; + }; + } + { + name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz"; + sha1 = "2d1dde0791f70b2ff2d0b915cab8d40b0e446594"; + }; + } + { + name = "_jimp_plugins___plugins_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_plugins___plugins_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.8.tgz"; + sha1 = "5279dfe22d0d27633f4201ab36103e587b32eb85"; + }; + } + { + name = "_jimp_png___png_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_png___png_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.8.tgz"; + sha1 = "f88dacc9b9da1c2ea8e91026a9530d0fb45c4409"; + }; + } + { + name = "_jimp_tiff___tiff_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_tiff___tiff_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.8.tgz"; + sha1 = "91dc3eab2f222e23414f139e917f3407caa73560"; + }; + } + { + name = "_jimp_types___types_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_types___types_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.8.tgz"; + sha1 = "46980a4a7bfcadf2f0484d187c32b4e7d6d61b8e"; + }; + } + { + name = "_jimp_utils___utils_0.9.8.tgz"; + path = fetchurl { + name = "_jimp_utils___utils_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.8.tgz"; + sha1 = "6a6f47158ec6b424f03df0f55f0baff5b4b5e096"; + }; + } + { name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; @@ -210,11 +466,11 @@ }; } { - name = "_types_node___node_9.6.55.tgz"; + name = "_types_node___node_13.13.21.tgz"; path = fetchurl { - name = "_types_node___node_9.6.55.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.55.tgz"; - sha1 = "7cc1358c9c18e71f6c020e410962971863232cf5"; + name = "_types_node___node_13.13.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.21.tgz"; + sha1 = "e48d3c2e266253405cf404c8654d1bcf0d333e5c"; }; } { @@ -370,6 +626,14 @@ }; } { + name = "ajv___ajv_6.12.5.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.5.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; + sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; + }; + } + { name = "ansi_align___ansi_align_2.0.0.tgz"; path = fetchurl { name = "ansi_align___ansi_align_2.0.0.tgz"; @@ -466,6 +730,14 @@ }; } { + name = "any_base___any_base_1.1.0.tgz"; + path = fetchurl { + name = "any_base___any_base_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz"; + sha1 = "ae101a62bc08a597b4c9ab5b7089d456630549fe"; + }; + } + { name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; path = fetchurl { name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; @@ -706,14 +978,6 @@ }; } { - name = "bignumber.js___bignumber.js_2.4.0.tgz"; - path = fetchurl { - name = "bignumber.js___bignumber.js_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz"; - sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; - }; - } - { name = "bin_links___bin_links_1.1.7.tgz"; path = fetchurl { name = "bin_links___bin_links_1.1.7.tgz"; @@ -746,11 +1010,11 @@ }; } { - name = "bmp_js___bmp_js_0.0.3.tgz"; + name = "bmp_js___bmp_js_0.1.0.tgz"; path = fetchurl { - name = "bmp_js___bmp_js_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz"; - sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; + name = "bmp_js___bmp_js_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; + sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; }; } { @@ -1242,6 +1506,14 @@ }; } { + name = "core_js___core_js_3.6.5.tgz"; + path = fetchurl { + name = "core_js___core_js_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; + sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; + }; + } + { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -1794,14 +2066,6 @@ }; } { - name = "es6_promise___es6_promise_3.3.1.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz"; - sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; - }; - } - { name = "es6_promise___es6_promise_4.2.8.tgz"; path = fetchurl { name = "es6_promise___es6_promise_4.2.8.tgz"; @@ -2186,11 +2450,11 @@ }; } { - name = "file_type___file_type_3.9.0.tgz"; + name = "file_type___file_type_9.0.0.tgz"; path = fetchurl { - name = "file_type___file_type_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"; - sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + name = "file_type___file_type_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz"; + sha1 = "a68d5ad07f486414dfb2c8866f73161946714a18"; }; } { @@ -2546,6 +2810,14 @@ }; } { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { name = "has_flag___has_flag_3.0.0.tgz"; path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; @@ -2770,11 +3042,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -2818,14 +3090,6 @@ }; } { - name = "ip_regex___ip_regex_1.0.3.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz"; - sha1 = "dc589076f659f419c222039a33316f1c7387effd"; - }; - } - { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { name = "ip_regex___ip_regex_2.1.0.tgz"; @@ -3138,19 +3402,19 @@ }; } { - name = "jimp___jimp_0.2.28.tgz"; + name = "jimp___jimp_0.9.8.tgz"; path = fetchurl { - name = "jimp___jimp_0.2.28.tgz"; - url = "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz"; - sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; + name = "jimp___jimp_0.9.8.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.9.8.tgz"; + sha1 = "2ee87b81b42e723ad74c73b8012f879c0abe5b04"; }; } { - name = "jpeg_js___jpeg_js_0.2.0.tgz"; + name = "jpeg_js___jpeg_js_0.3.7.tgz"; path = fetchurl { - name = "jpeg_js___jpeg_js_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz"; - sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; + name = "jpeg_js___jpeg_js_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.7.tgz"; + sha1 = "471a89d06011640592d314158608690172b1028d"; }; } { @@ -3466,11 +3730,11 @@ }; } { - name = "load_bmfont___load_bmfont_1.4.0.tgz"; + name = "load_bmfont___load_bmfont_1.4.1.tgz"; path = fetchurl { - name = "load_bmfont___load_bmfont_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz"; - sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; + name = "load_bmfont___load_bmfont_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz"; + sha1 = "c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"; }; } { @@ -4130,11 +4394,11 @@ }; } { - name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; path = fetchurl { - name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; - sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz"; + sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561"; }; } { @@ -4242,6 +4506,14 @@ }; } { + name = "omggif___omggif_1.0.10.tgz"; + path = fetchurl { + name = "omggif___omggif_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz"; + sha1 = "ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"; + }; + } + { name = "once___once_1.4.0.tgz"; path = fetchurl { name = "once___once_1.4.0.tgz"; @@ -4442,6 +4714,14 @@ }; } { + name = "pako___pako_1.0.11.tgz"; + path = fetchurl { + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; + }; + } + { name = "parallel_transform___parallel_transform_1.2.0.tgz"; path = fetchurl { name = "parallel_transform___parallel_transform_1.2.0.tgz"; @@ -4618,11 +4898,11 @@ }; } { - name = "png_to_ico___png_to_ico_1.0.7.tgz"; + name = "png_to_ico___png_to_ico_2.1.0.tgz"; path = fetchurl { - name = "png_to_ico___png_to_ico_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-1.0.7.tgz"; - sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; + name = "png_to_ico___png_to_ico_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.0.tgz"; + sha1 = "b7a59bc7e95093f6dd4dc85f27b9048e12d2fe71"; }; } { @@ -4762,6 +5042,14 @@ }; } { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { name = "pump___pump_2.0.1.tgz"; path = fetchurl { name = "pump___pump_2.0.1.tgz"; @@ -4858,14 +5146,6 @@ }; } { - name = "read_chunk___read_chunk_1.0.1.tgz"; - path = fetchurl { - name = "read_chunk___read_chunk_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz"; - sha1 = "5f68cab307e663f19993527d9b589cace4661194"; - }; - } - { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; path = fetchurl { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; @@ -4962,6 +5242,14 @@ }; } { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + }; + } + { name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; path = fetchurl { name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; @@ -5034,6 +5322,14 @@ }; } { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; @@ -5498,22 +5794,6 @@ }; } { - name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; - path = fetchurl { - name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"; - sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; - }; - } - { - name = "stream_to___stream_to_0.2.2.tgz"; - path = fetchurl { - name = "stream_to___stream_to_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz"; - sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; - }; - } - { name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; path = fetchurl { name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; @@ -5794,6 +6074,14 @@ }; } { + name = "timm___timm_1.7.1.tgz"; + path = fetchurl { + name = "timm___timm_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz"; + sha1 = "96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f"; + }; + } + { name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; path = fetchurl { name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; @@ -5802,11 +6090,11 @@ }; } { - name = "tinycolor2___tinycolor2_1.4.1.tgz"; + name = "tinycolor2___tinycolor2_1.4.2.tgz"; path = fetchurl { - name = "tinycolor2___tinycolor2_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz"; - sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; + name = "tinycolor2___tinycolor2_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz"; + sha1 = "3f6a4d1071ad07676d7fa472e1fac40a719d8803"; }; } { @@ -5858,6 +6146,14 @@ }; } { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; @@ -6098,14 +6394,6 @@ }; } { - name = "url_regex___url_regex_3.2.0.tgz"; - path = fetchurl { - name = "url_regex___url_regex_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz"; - sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; - }; - } - { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; @@ -6114,6 +6402,14 @@ }; } { + name = "utif___utif_2.0.1.tgz"; + path = fetchurl { + name = "utif___utif_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz"; + sha1 = "9e1582d9bbd20011a6588548ed3266298e711759"; + }; + } + { name = "util_deprecate___util_deprecate_1.0.2.tgz"; path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index d44fadea78fc..b6dfac397a11 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.7"; + version = "1.7.16"; src = fetchFromGitHub { owner = "vector-im"; - repo = "riot-desktop"; + repo = "element-desktop"; rev = "v${version}"; - sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2"; + sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; electron = electron_9; @@ -60,7 +60,7 @@ in mkYarnPackage rec { # https://github.com/vector-im/riot-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; - exec = executableName; + exec = "${executableName} %u"; icon = "element"; desktopName = "Element (Riot)"; genericName = "Matrix Client"; @@ -68,6 +68,7 @@ in mkYarnPackage rec { categories = "Network;InstantMessaging;Chat;"; extraEntries = '' StartupWMClass=element + MimeType=x-scheme-handler/element; ''; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 3130c2cac46c..527af7a4de06 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.7"; + version = "1.7.16"; src = fetchurl { - url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1hly102725qh4xjggxv85w1hyq26mhkgj3y6s76yar7i3smj6kpw"; + url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; + sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM="; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index e0f56e2783d0..190050d8327b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -9,7 +9,7 @@ mkFranzDerivation rec { sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k"; }; meta = with stdenv.lib; { - description = "Ferdi allows you to combine your favorite messaging services into one application"; + description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; license = licenses.free; maintainers = [ maintainers.davidtwco ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 68e7282870ba..bc6dbc5ce193 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -12,7 +12,7 @@ , pkg-config , gtksourceview4 , glib -, libhandy +, libhandy_0 , gtk3 , dbus , openssl @@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec { gtkSupport = true; }) gst_all_1.gstreamer - gst_all_1.gst-validate + gst_all_1.gst-devtools gtk3 gtksourceview4 - libhandy + libhandy_0 openssl sqlite ]; @@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; + broken = stdenv.isDarwin; 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 52bc60b5affd..646a790fed25 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.5.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm"; + sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p"; }; meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index 3f05e3d7a5d3..96865374bed1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -28,7 +28,7 @@ # Helper function for building a derivation for Franz and forks. { pname, name, version, src, meta }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version src meta; # Don't remove runtime deps. @@ -65,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ (lib.getLib udev) libnotify ]; + runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; @@ -84,6 +84,7 @@ stdenv.mkDerivation { postFixup = '' wrapProgram $out/opt/${name}/${pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --prefix PATH : ${xdg_utils}/bin \ "''${gappsWrapperArgs[@]}" ''; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2ee017dfdbaf..eef24f75f155 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -60,6 +60,9 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} setup.py test ''; + # necessary for wrapGAppsHook + strictDeps = false; + meta = { homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix index 57b745057dce..69a198480668 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,29 +1,61 @@ -{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11 +{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx -, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss +, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss , pango, systemd }: let gitterDirectorySuffix = "opt/gitter"; + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + at-spi2-core + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libcxx + libdrm + libnotify + libpulseaudio + libxcb + mesa + nspr + nss + pango + stdenv.cc.cc + systemd + ]; doELFPatch = target: '' patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ $out/${gitterDirectorySuffix}/${target} ''; - libPath = stdenv.lib.makeLibraryPath [ - alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage - libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3 - libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd - ]; in stdenv.mkDerivation rec { pname = "gitter"; - version = "4.1.0"; + version = "5.0.1"; src = fetchurl { url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; - sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi"; + sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index c98fd9e80406..00134e2597be 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v" + version; - sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q"; + sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n"; }; - vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf"; + vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x"; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 7213332a549a..63cbb69b187d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index e27835851445..1344440eafc8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -31,6 +31,7 @@ , mbedtls , mediastreamer , mediastreamer-openh264 +, minizip2 , mkDerivation , openldap , ortp @@ -47,81 +48,30 @@ , 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"; - disabled = stdenv.isAarch32; - - 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"; + version = "4.2.5"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "971997e162558d37051f89c9c34bbc240135f704"; - sha256 = "02ji4r8bpcm2kyisn9d3054m026l33g2574i1ag1cmb2dz2p8i1c"; + rev = version; + sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz"; }; - # 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 + ./do-not-build-linphone-sdk.patch + ./remove-bc_compute_full_version-usage.patch ]; # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 postPatch = '' - substituteInPlace src/app/AppController.cpp \ + echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake + substituteInPlace linphone-app/src/app/AppController.cpp \ --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" ''; @@ -214,14 +164,13 @@ mkDerivation rec { # those just need to be copied manually below. installPhase = '' mkdir -p $out/bin - cp linphone $out/bin/ + cp linphone-app/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/ + cp linphone-app/linphone.desktop $out/share/applications/ + cp -r ../linphone-app/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 @@ -231,7 +180,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch new file mode 100644 index 000000000000..fe774a479fac --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch @@ -0,0 +1,118 @@ +From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001 +From: David P <megver83@parabola.nu> +Date: Thu, 26 Nov 2020 15:56:30 -0300 +Subject: [PATCH 1/2] do not build linphone-sdk + +Signed-off-by: David P <megver83@parabola.nu> +--- + CMakeLists.txt | 61 +------------------ + .../cmake_builder/additional_steps.cmake | 9 --- + 2 files changed, 3 insertions(+), 67 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..5921ee5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") + + list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + +-include(ExternalProject) + set(PROJECT_BUILD_COMMAND "") + if(CMAKE_BUILD_PARALLEL_LEVEL) + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") +@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") + list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") + endif() +-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- #BUILD_ALWAYS NO #${DO_BUILD} +-) +-ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'desktop'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +-) + include(FindPkgConfig) + +-set(APP_DEPENDS sdk) +- +- + find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + + if ( NOT Qt5_FOUND ) +@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET) + find_package(ortp CONFIG QUIET) + + +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) +- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") +- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- DEPENDS ${APP_DEPENDS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- # ${APP_OPTIONS} +- BUILD_ALWAYS ON +- ) +- install(CODE "message(STATUS Running install)") +- set(AUTO_REGENERATION auto_regeneration) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +-else() +- message("Adding Linphone Desktop in an IDE-friendly state") +- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") +- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- add_dependencies(app-library ${APP_DEPENDS}) +-endif() +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- EXCLUDE_FROM_ALL ON +- BUILD_ALWAYS ON +-) ++message("Adding Linphone Desktop in an IDE-friendly state") ++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake +index 7f7fd573..a69a04e8 100644 +--- a/linphone-app/cmake_builder/additional_steps.cmake ++++ b/linphone-app/cmake_builder/additional_steps.cmake +@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) + linphone_builder_apply_flags() + linphone_builder_set_ep_directories(linphone_package) + linphone_builder_expand_external_project_vars() +- ExternalProject_Add(TARGET_linphone_package +- DEPENDS TARGET_linphone_builder +- TMP_DIR ${ep_tmp} +- BINARY_DIR ${ep_build} +- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" +- DOWNLOAD_COMMAND "" +- CMAKE_GENERATOR ${CMAKE_GENERATOR} +- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} +- ) + endif () + endif () +-- +2.29.2 + 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 deleted file mode 100644 index bb88d0030fae..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/linphone/remove-bc_compute_full_version-usage.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch new file mode 100644 index 000000000000..547652d3af7f --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch @@ -0,0 +1,74 @@ +From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 +From: David P <megver83@parabola.nu> +Date: Fri, 23 Oct 2020 16:44:17 -0300 +Subject: [PATCH 2/2] remove bc_compute_full_version usage + +--- + linphone-app/CMakeLists.txt | 11 +---------- + linphone-app/build/CMakeLists.txt | 5 ----- + .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- + 3 files changed, 2 insertions(+), 24 deletions(-) + +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index 3bc9420a..27b418ee 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -21,17 +21,8 @@ + ################################################################################ + cmake_minimum_required(VERSION 3.1) + ++include(linphoneqt_version.cmake) + find_package(bctoolbox CONFIG) +-set(FULL_VERSION ) +-bc_compute_full_version(FULL_VERSION) +-set(version_major ) +-set(version_minor ) +-set(version_patch ) +-set(identifiers ) +-set(metadata ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) +- +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt +index 8ef03faa..97d94bd6 100644 +--- a/linphone-app/build/CMakeLists.txt ++++ b/linphone-app/build/CMakeLists.txt +@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES + "libmng.spec" + ) + +-bc_compute_full_version(PROJECT_VERSION_BUILD) +-if(PROJECT_VERSION_BUILD) +- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") +-endif() +- + message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") + + set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) +diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +index baea03cf..08ffc1b5 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") + # ============================================================================== + # Build package version. + # ============================================================================== +-bc_compute_full_version(APP_PROJECT_VERSION) +-if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) +- execute_process( +- COMMAND ${GIT_EXECUTABLE} describe --always +- OUTPUT_VARIABLE APP_PROJECT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE +- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." +- ) +-elseif (NOT(APP_PROJECT_VERSION)) ++if (NOT(APP_PROJECT_VERSION)) + set(APP_PROJECT_VERSION "0.0.0") + endif () + string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") +-- +2.29.2 + diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index 97f775220229..caf6669e120b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,14 +1,14 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - pname = "matrix-dl-unstable"; - version = "2019-09-22"; + pname = "matrix-dl"; + version = "unstable-2020-07-14"; src = fetchFromGitHub { owner = "rubo77"; - repo = "matrix-dl"; - rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69"; - sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; + repo = pname; + rev = "b1a86d1421f39ee327284e1023f09dc165e3c8a5"; + sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index e03bdd9909e8..92ddfe342982 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index 670556bf271a..ff5ca0d99b19 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -396,7 +396,7 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -468,7 +468,7 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -514,7 +514,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 98b326820b9f..23db7d1ce257 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mcabber"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; + sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index 1101d6f9b06e..decdb18aa063 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication."; + meta = with stdenv.lib; { + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index 3bdfcbfe7d1d..a9306a751ac8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitLab }: +{ stdenv, buildGoModule, fetchgit }: -buildGoPackage { +buildGoModule { pname = "mm"; - version = "2016.11.04"; + version = "2020.11.17"; - goPackagePath = "gitlab.com/meutraa/mm"; - - src = fetchFromGitLab { - owner = "meutraa"; - repo = "mm"; - rev = "473fdd97285168054b672dbad2ffc4047324c518"; - sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp"; + src = fetchgit { + url = "https://git.lost.host/meutraa/mm.git"; + rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c"; + sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; - meta = { + vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; + + meta = with stdenv.lib; { description = "A file system based matrix client"; - homepage = "https://gitlab.com/meutraa/mm"; - license = stdenv.lib.licenses.isc; + homepage = "https://git.lost.host/meutraa/mm"; + license = licenses.isc; + maintainers = with maintainers; [ meutraa ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix new file mode 100644 index 000000000000..2a489ee3e713 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -0,0 +1,67 @@ +{ mkDerivation +, stdenv +, fetchFromGitLab +, pkg-config +, cmake +, qtbase +, qttools +, qtquickcontrols2 +, qtmultimedia +, qtgraphicaleffects +, qtkeychain +, libpulseaudio +, olm +, libsecret +, cmark +, extra-cmake-modules +, kirigami2 +, kitemmodels +, ki18n +, knotifications +, kdbusaddons +, kconfig +, libquotient +, kquickimageedit +}: + +mkDerivation rec { + pname = "neochat"; + version = "1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = [ + qtkeychain + qtquickcontrols2 + qtmultimedia + qtgraphicaleffects + olm + libsecret + cmark + kirigami2 + kitemmodels + ki18n + knotifications + kdbusaddons + kconfig + libquotient + kquickimageedit + libpulseaudio + ]; + + meta = with stdenv.lib; { + description = "A client for matrix, the decentralized communication protocol."; + homepage = "https://apps.kde.org/en/neochat"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mjlbach peterhoeg ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe27..80ffbebe9be3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,6 +17,7 @@ , mtxclient , boost17x , spdlog +, fmt , olm , pkgconfig , nlohmann_json @@ -47,6 +48,7 @@ mkDerivation rec { boost17x lmdb spdlog + fmt cmark qtbase qtmultimedia diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index a751501376ff..9c99741823aa 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; + sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9"; }; propagatedBuildInputs = [ @@ -56,7 +56,7 @@ buildPythonApplication rec { ''; meta = with lib; { - description = "An end-to-end encryption aware Matrix reverse proxy daemon."; + description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; license = licenses.asl20; maintainers = with maintainers; [ valodim ]; 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 7bb2517a1887..72309e3479fe 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 @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; rev = version; - sha256 = "1q3m8hyr77mxm4y0zify2xhjp9d8y4pgwvqyfly4zcpmyd2argi1"; + sha256 = "11snyrjhm58gjvdmr5h5ajii3ah4a7c8zw3cavjv9xnnwrpfm5rb"; }; setSourceRoot = '' 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 7d7abbd1eed6..5b3a1564aebf 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 @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "purple-slack-unstable"; - version = "2019-08-18"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "dylex"; repo = "slack-libpurple"; - rev = "be97802c7fd0b611722d2f551756e2a2672f6084"; - sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v"; + rev = "2e9fa028224b02e29473b1b998fc1e5f487e79ec"; + sha256 = "1sksqshiwldd32k8jmiflp2pcax31ym6rypr4qa4v5vdn907g80m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix index 52172bd8be77..4dfca92f39f3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode +, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch , autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch"; + sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k"; + }) ./patches/packages-osx.patch ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index cf7c1008a080..1112a3215c9d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "psi-plus"; version = "1.4.1473"; @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { "-DENABLE_PLUGINS=ON" ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - meta = with stdenv.lib; { + meta = with lib; { + homepage = "https://sourceforge.net/projects/psiplus/"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix index c1984a218c8a..08c3ab96210f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libXScrnSaver, hunspell }: -stdenv.mkDerivation rec { + +mkDerivation rec { pname = "psi"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "psi-im"; repo = pname; rev = version; - sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM="; fetchSubmodules = true; }; patches = [ ./fix-cmake-hunspell-1.7.patch ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "Psi, an XMPP (Jabber) client"; + + meta = with lib; { + homepage = "https://psi-im.org"; + description = "An XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 0df7a5d8e560..2605d6dc0818 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,24 +1,19 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, libtoxcore -, libpthreadstubs, libXdmcp, libXScrnSaver +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl +, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver , qtbase, qtsvg, qttools, qttranslations , ffmpeg_3, filter-audio, libexif, libsodium, libopus , libvpx, openal, pcre, qrencode, sqlcipher -, AVFoundation ? null }: +, AVFoundation }: -let - version = "1.17.2"; - rev = "v${version}"; - -in mkDerivation { +mkDerivation rec { pname = "qtox"; - inherit version; + version = "1.17.3"; src = fetchFromGitHub { - owner = "qTox"; - repo = "qTox"; - sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9"; - inherit rev; + owner = "qTox"; + repo = "qTox"; + rev = "v${version}"; + sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp"; }; buildInputs = [ @@ -27,25 +22,24 @@ in mkDerivation { qtbase qtsvg qttranslations ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; - - nativeBuildInputs = [ cmake pkgconfig qttools ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config qttools ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl ]; cmakeFlags = [ - "-DGIT_DESCRIBE=${rev}" + "-DGIT_DESCRIBE=v${version}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" "-DTIMESTAMP=1" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Qt Tox client"; - homepage = "https://tox.chat"; - license = licenses.gpl3; + homepage = "https://tox.chat"; + license = licenses.gpl3; maintainers = with maintainers; [ akaWolf peterhoeg ]; - platforms = platforms.all; + 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 b1577a37844d..f918cbdc2b89 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "quaternion"; - version = "0.0.9.4e"; + version = "0.0.9.5-beta2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; - rev = "${version}"; - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; + rev = version; + sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index a067259d1127..cc9fab4d3752 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,18 +3,18 @@ }: let - version = "0.7.6"; + version = "0.7.7"; in stdenv.mkDerivation rec { pname = "rambox"; inherit version; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl"; + sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i"; + sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index d39091d4618e..3cdf1339e3bf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,11 +1,11 @@ -{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: let - electron = electron_4; + electron = electron_7; in stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.3.2"; + version = "1.4.1"; dontBuild = true; dontStrip = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx"; + sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; }; installPhase = '' 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 c1b9cdc122c4..93ab78c439a6 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.10"; + version = "0.6.12"; # 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 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim"; + sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; 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 85f71fd0ebcc..44df5f6be687 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.36.3"; # Please backport all updates to the stable channel. + version = "1.39.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,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 = "1b75b5li0im2mwskkf1xsa6sjprl56isvcz2iy1gc48bambc72pc"; + sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch deleted file mode 100644 index 8b8ce8fd7bbf..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch +++ /dev/null @@ -1,148 +0,0 @@ -From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001 -From: jlh <jlh@gmx.ch> -Date: Fri, 16 Oct 2009 17:40:54 +0200 -Subject: [PATCH] Rudimentary support for recording hosted conference calls - ---- - call.cpp | 37 +++++++++++++++++++++++++++++++++++-- - call.h | 11 ++++++++++- - 2 files changed, 45 insertions(+), 3 deletions(-) - -diff --git a/call.cpp b/call.cpp -index c2b02f2..663c1c1 100644 ---- a/call.cpp -+++ b/call.cpp -@@ -90,9 +90,10 @@ void AutoSync::reset() { - - // Call class - --Call::Call(QObject *p, Skype *sk, CallID i) : -- QObject(p), -+Call::Call(CallHandler *h, Skype *sk, CallID i) : -+ QObject(h), - skype(sk), -+ handler(h), - id(i), - status("UNKNOWN"), - writer(NULL), -@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) : - debug(QString("Call %1: cannot get partner display name").arg(id)); - displayName = "Unnamed Caller"; - } -+ -+ // Skype does not properly send updates when the CONF_ID property -+ // changes. since we need this information, check it now on all calls -+ handler->updateConfIDs(); -+ // this call isn't yet in the list of calls, thus we need to -+ // explicitely check its CONF_ID -+ updateConfID(); - } - - Call::~Call() { -@@ -134,6 +142,10 @@ Call::~Call() { - // QT takes care of deleting servers and sockets - } - -+void Call::updateConfID() { -+ confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong(); -+} -+ - bool Call::okToDelete() const { - // this is used for checking whether past calls may now be deleted. - // when a past call hasn't been decided yet whether it should have been -@@ -270,6 +282,11 @@ void Call::startRecording(bool force) { - if (isRecording) - return; - -+ if (handler->isConferenceRecording(confID)) { -+ debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id)); -+ return; -+ } -+ - if (force) { - emit showLegalInformation(); - } else { -@@ -589,6 +606,22 @@ CallHandler::~CallHandler() { - delete legalInformationDialog; - } - -+void CallHandler::updateConfIDs() { -+ QList<Call *> list = calls.values(); -+ for (int i = 0; i < list.size(); i++) -+ list.at(i)->updateConfID(); -+} -+ -+bool CallHandler::isConferenceRecording(CallID id) const { -+ QList<Call *> list = calls.values(); -+ for (int i = 0; i < list.size(); i++) { -+ Call *c = list.at(i); -+ if (c->getConfID() == id && c->getIsRecording()) -+ return true; -+ } -+ return false; -+} -+ - void CallHandler::callCmd(const QStringList &args) { - CallID id = args.at(0).toInt(); - -diff --git a/call.h b/call.h -index cb8396d..b746f46 100644 ---- a/call.h -+++ b/call.h -@@ -43,6 +43,8 @@ class QTcpServer; - class QTcpSocket; - class LegalInformationDialog; - -+class CallHandler; -+ - typedef int CallID; - - class AutoSync { -@@ -68,18 +70,21 @@ private: - class Call : public QObject { - Q_OBJECT - public: -- Call(QObject *, Skype *, CallID); -+ Call(CallHandler *, Skype *, CallID); - ~Call(); - void startRecording(bool = false); - void stopRecording(bool = true); -+ void updateConfID(); - bool okToDelete() const; - void setStatus(const QString &); - QString getStatus() const { return status; } - bool statusDone() const; - bool statusActive() const; - CallID getID() const { return id; } -+ CallID getConfID() const { return confID; } - void removeFile(); - void hideConfirmation(int); -+ bool getIsRecording() const { return isRecording; } - - signals: - void startedCall(int, const QString &); -@@ -99,10 +104,12 @@ private: - - private: - Skype *skype; -+ CallHandler *handler; - CallID id; - QString status; - QString skypeName; - QString displayName; -+ CallID confID; - AudioFileWriter *writer; - bool isRecording; - int stereo; -@@ -140,6 +147,8 @@ class CallHandler : public QObject { - public: - CallHandler(QObject *, Skype *); - ~CallHandler(); -+ void updateConfIDs(); -+ bool isConferenceRecording(CallID) const; - void callCmd(const QStringList &); - - signals: --- -1.6.5.GIT - 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 deleted file mode 100644 index 57d1ffece71a..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }: - -stdenv.mkDerivation { - name = "skype-call-recorder-0.8"; - src = fetchurl { - url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; - sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di"; - }; - - # Keep an rpath reference to the used libogg - prePatch = '' - sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt - ''; - - # Better support for hosted conferences - patches = [ ./conference.patch ]; - - buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ]; - NIX_LDFLAGS = "-lvorbis"; - - meta = { - 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; - maintainers = with stdenv.lib.maintainers; [viric]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index bdcaf3bd6085..d4e43ed3a92d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.63.0.76"; + version = "8.66.0.74"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0gmrk1giabr53imiwdflf6ykwpcj2q5zn3bynvrncnhivsbvaavy"; + sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; @@ -108,6 +108,10 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ + --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ + --replace /usr/bin/ $out/bin/ ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 2edccd8c019e..5f367c76a928 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -25,6 +25,7 @@ , libpulseaudio , libuuid , libxcb +, libxkbcommon , mesa , nspr , nss @@ -39,9 +40,16 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "slack"; + + x86_64-darwin-version = "4.11.1"; + x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35"; + + x86_64-linux-version = "4.11.1"; + x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g"; + version = { - x86_64-darwin = "4.9.0"; - x86_64-linux = "4.9.1"; + x86_64-darwin = x86_64-darwin-version; + x86_64-linux = x86_64-linux-version; }.${system} or throwSystem; src = let @@ -49,11 +57,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; + sha256 = x86_64-darwin-sha256; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; + sha256 = x86_64-linux-sha256; }; }.${system} or throwSystem; @@ -68,6 +76,8 @@ let linux = stdenv.mkDerivation rec { inherit pname version src meta; + passthru.updateScript = ./update.sh; + rpath = stdenv.lib.makeLibraryPath [ alsaLib at-spi2-atk @@ -90,6 +100,7 @@ let libpulseaudio libuuid libxcb + libxkbcommon mesa nspr nss @@ -152,6 +163,8 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ undmg ]; sourceRoot = "Slack.app"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh new file mode 100755 index 000000000000..adef44411091 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl gnused + +set -eou pipefail + +latest_linux_version=$(curl --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') +latest_mac_version=$(curl --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') + +# Double check that the latest mac and linux versions are in sync. +if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then + echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" + exit 1 +fi + +nixpkgs="$(git rev-parse --show-toplevel)" +slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" +nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') + +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then + echo "nixpkgs versions are all up to date!" + exit 0 +fi + +linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +linux_sha256=$(nix-prefetch-url ${linux_url}) +mac_sha256=$(nix-prefetch-url ${mac_url}) + +sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" + +if ! nix-build -A slack "$nixpkgs"; then + echo "The updated slack failed to build." + exit 1 +fi + +echo "Successfully updated" +echo "slack: $nixpkgs_linux_version -> $latest_linux_version" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix deleted file mode 100644 index 23659e8a6c9c..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit -, pkgconfig, wrapQtAppsHook -, cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed -, qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark -}: - -let qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; -in stdenv.mkDerivation rec { - pname = "spectral"; - version = "817"; - - src = fetchgit { - url = "https://gitlab.com/spectral-im/spectral.git"; - rev = version; - sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] - ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client."; - homepage = "https://spectral.im"; - license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix index 5806a269104b..e964c654c708 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "ssh-chat"; - version = "1.9"; + version = "1.10"; goPackagePath = "github.com/shazow/ssh-chat"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "shazow"; repo = "ssh-chat"; rev = "v${version}"; - sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg"; + sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U="; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index d58e27cc62bb..1f4e11527ccd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.16851"; + version = "1.3.00.30857"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3"; + sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; @@ -47,9 +47,13 @@ stdenv.mkDerivation rec { mv share $out/share substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ $out/bin/ + --replace /usr/bin/ "" ln -s $out/opt/teams/teams $out/bin/ + + # Work-around screen sharing bug + # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html + rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay ''; dontAutoPatchelf = true; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 7d2586c67081..ba726d5b3771 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.5.3"; + version = "3.5.6"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; sha256 = if stdenv.is64bit - then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a" - else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6"; + then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg" + else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija"; }; # grab the plugin sdk for the desktop icon @@ -99,15 +99,15 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; license = { fullName = "Teamspeak client license"; - url = "http://sales.teamspeakusa.com/licensing.php"; + url = "https://www.teamspeak.com/en/privacy-and-terms/"; free = false; }; - maintainers = [ stdenv.lib.maintainers.lhvwb ]; + maintainers = with maintainers; [ lhvwb lukegb ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 761d7cfcbd4b..521e60c78f00 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, autoPatchelfHook, writeScript }: +{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.12.1"; + version = "3.13.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" - else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; + then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz" + else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g"; }; - buildInputs = [ stdenv.cc.cc ]; + buildInputs = [ stdenv.cc.cc postgresql.lib ]; nativeBuildInputs = [ autoPatchelfHook ]; 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 7e932d74abc5..d4cc5293a9be 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchurl, fetchsvn -, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +{ mkDerivation, lib, fetchurl, callPackage +, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell # TODO: Shouldn't be required: -, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst +, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils }: @@ -17,14 +17,17 @@ with lib; # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template -mkDerivation rec { +let + tg_owt = callPackage ./tg_owt.nix {}; + +in mkDerivation rec { pname = "telegram-desktop"; - version = "2.3.0"; + version = "2.5.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0yga4p36jrc5m3d8q2y2g0505c2v540w5hgcscapl4xj9hyb21dw"; + sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; }; postPatch = '' @@ -38,14 +41,15 @@ mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell + tg_owt # TODO: Shouldn't be required: - pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst + pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst ]; enableParallelBuilding = true; @@ -55,12 +59,6 @@ mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" - "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" - "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" - "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" - "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" - "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; @@ -93,6 +91,10 @@ mkDerivation rec { -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; + passthru = { + inherit tg_owt; + }; + meta = { description = "Telegram Desktop messaging app"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix new file mode 100644 index 000000000000..2853418da0e3 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +}: + +let + rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; + sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; + +in stdenv.mkDerivation { + pname = "tg_owt"; + version = "git-${rev}"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + inherit rev sha256; + fetchSubmodules = true; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + + buildInputs = [ + libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + ]; + + meta.license = lib.licenses.bsd3; +} 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 a6e74443f291..bc0657f7b1a7 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,7 +1,6 @@ { stdenv , fetchurl -, fetchpatch -, pkgconfig +, pkg-config , dconf , telepathy-glib , python3 @@ -11,31 +10,21 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; - version = "5.16.5"; + version = "5.16.6"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; + sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d"; }; - 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 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb"; - }) - ]; - buildInputs = [ python3 ]; # ToDo: optional stuff missing nativeBuildInputs = [ - pkgconfig + pkg-config libxslt makeWrapper ]; @@ -57,7 +46,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/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index 540aa3fcea4d..a2489427b946 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"; + sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index e53b8c7391e8..24ce75dc7974 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,15 +1,16 @@ {fetchurl, stdenv, dpkg, makeWrapper, - alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, + harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, + nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: stdenv.mkDerivation { pname = "viber"; - version = "7.0.0.1035"; + version = "13.3.1.22"; src = fetchurl { url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj"; + sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; }; buildInputs = [ dpkg makeWrapper ]; @@ -29,10 +30,11 @@ stdenv.mkDerivation { gst_all_1.gstreamer harfbuzz libcap + libGLU libGL libpulseaudio + libxkbcommon libxml2 libxslt - libGLU libGL nspr nss openssl 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 a07afc181164..b198b954bd40 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,13 +22,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.19.3799"; - x86_64-linux = "3.19.2928"; + x86_64-darwin = "3.21.3959"; + x86_64-linux = "3.21.2936"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1sv8n4g1pd4nwpwsg0m61zhrfjlh7sj29rnh46xjw1qg332g6cw9"; - x86_64-linux = "038h1j59qfj5ckaxk823qpfflxay47v0jrqc0hmrdmnd2y59dpx7"; + x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; + x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; }.${system} or throwSystem; meta = with stdenv.lib; { 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 d176b66f7e5f..887e3f458bc4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -6,8 +6,9 @@ , qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel , qtwebengine # Runtime -, coreutils, faac, pciutils, procps, utillinux +, coreutils, faac, pciutils, procps, util-linux , pulseaudioSupport ? true, libpulseaudio ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null }: assert pulseaudioSupport -> libpulseaudio != null; @@ -15,11 +16,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.3.465578.0920"; + version = "5.4.53350.1027"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp"; + sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x"; }; }; @@ -27,8 +28,8 @@ let desktopIntegration = fetchFromGitHub { owner = "flathub"; repo = "us.zoom.Zoom"; - rev = "0d294e1fdd2a4ef4e05d414bc680511f24d835d7"; - sha256 = "0rm188844a10v8d6zgl2pnwsliwknawj09b02iabrvjw5w1lp6wl"; + rev = "25e14f8141cdc682b4f7d9ebe15608619f5a19f2"; + sha256 = "0w3pdd5484r3nsb4iahi37jdlm37vm1053sb8k2zlqb9s554zjwp"; }; in mkDerivation { @@ -45,7 +46,8 @@ in mkDerivation { qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland ]; - runtimeDependencies = optional pulseaudioSupport libpulseaudio; + runtimeDependencies = optional pulseaudioSupport libpulseaudio + ++ optional alsaSupport alsaLib; installPhase = let @@ -103,7 +105,7 @@ in mkDerivation { dontWrapQtApps = true; qtWrapperArgs = [ - ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}'' + ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}'' # --run "cd ${placeholder "out"}/share/zoom-us" # ^^ unfortunately, breaks run arg into multiple array elements, due to # some bad array propagation. We'll do that in bash below diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index c1ae0ce0a067..a177499154ee 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 = "5.4.0"; + version = "5.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "14p0nly144rivd9yk273asfjza5p9qncpbmh4qxnd4gq01f98igh"; + sha256 = "059zfcvaq8wnsz2lfd4gdb17b6nngqk3vgisy2kb29ifqf3lpzqi"; 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://zulip.com"; license = licenses.asl20; maintainers = with maintainers; [ jonafato ]; platforms = [ "x86_64-linux" ]; |