diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers')
27 files changed, 164 insertions, 530 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2bb15a79b941..f7ac823caaad 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.85.17"; + version = "3.90.11"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage"; - hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.90.11-build-2312112f0wxx20y.AppImage"; + hash = "sha256-ZYv0PUvZiw8pcszCVCd7mHE/+VHb+I25OPu5R7vI1j4="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a946ab60e4db..ab6b0ff5abc4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -23,12 +23,12 @@ let esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.14.54"; + version = "0.19.8"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; + hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -36,16 +36,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.42.1"; + version = "1.42.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k="; + hash = "sha256-c8eK6YpxCP+Ga/VcqbbOUYuL1h4xspjglCZ1wiEAags="; }; - npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo="; + npmDepsHash = "sha256-7xMSsKESK9BqQrMvxceEhsETwDFue0/viCNULtzzwGo="; postPatch = '' test \ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 83bf99b828d1..879314a97f0e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, buildPackages , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita @@ -86,6 +87,10 @@ stdenv.mkDerivation rec { "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" "-DVERSION_FULL=${version}" + "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" + "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" + "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "-DSOUP_VERSION=${lib.versions.major libsoup.version}" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 6a5cdfd152de..aa8db54725c9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,52 +1,53 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let - versions = if stdenv.isLinux then { - stable = "0.0.35"; - ptb = "0.0.56"; - canary = "0.0.184"; - development = "0.0.0"; - } else { - stable = "0.0.284"; - ptb = "0.0.87"; - canary = "0.0.340"; - development = "0.0.2"; - }; + versions = + if stdenv.isLinux then { + stable = "0.0.37"; + ptb = "0.0.59"; + canary = "0.0.213"; + development = "0.0.1"; + } else { + stable = "0.0.287"; + ptb = "0.0.90"; + canary = "0.0.365"; + development = "0.0.10"; + }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; + hash = "sha256-uyflZ1Zks7M1Re6DxuNUAkIuPY4wFSydf2AGMtIube8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; + hash = "sha256-WhDEyRMjuy2e1N51tUj3v97Y0qWabCFPThaehadXFWs="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; + hash = "sha256-DGRq58Xj5p/7BunY/vFds9LVmxYOl9LcF8ESHrCLly4="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; + hash = "sha256-unzPakomF2hmiikrNfnOueBdcuZCz2z3oCA7Djn6OmY="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; + hash = "sha256-DTkWrUgSYP98IVFTWcm4muRR91Kfvs5pBxc1tvPmj/s="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; + hash = "sha256-wOTgcHRUu/CjdnvQVNL+rkazhVbZjwI+UbfmsF6aveg="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; + hash = "sha256-a4MyO2Wst+ZYNSpUaF0TXJKtDQcPRLehapwRzp10R2k="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; + hash = "sha256-FoYRW5SaR/53yKs/T2XKVKQevA3MxMWAJFjixtwsEF4="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index a730d8611b78..cc8447a8d139 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.50"; + "version" = "1.11.51"; "hashes" = { - "desktopSrcHash" = "sha256-ZSzH0QWUSmoSk57TF7EH3DbUFO4VX8jCrH55oruMP+s="; - "desktopYarnHash" = "044sjxpd86zhmd0wcqmsnjvrh1krspp2qd9xzlxii4zwm9jz1hxn"; - "webSrcHash" = "sha256-6BzqETzQL4Xi4YqSyjFmIgajPPpagTS4tYhOZrEfEpo="; - "webYarnHash" = "1aw40r44dvl43bfgl2cr52hdj833maq2xyg3xa49837m7lf6pr8c"; + "desktopSrcHash" = "sha256-XsDXE8bny8gdojk6/NLcUGJcZlYM2hd9q5J36IDCdaU="; + "desktopYarnHash" = "03iixkw5swgm71prckspbx23jnf4dkfv2gfzvi5v4mqwddwrfp1w"; + "webSrcHash" = "sha256-8LNPnaj4yCiZt9RSFQM37yhO/tcc2VSM7reRQX5w734="; + "webYarnHash" = "03fmk30b6aq5lgabpmpcb8c4y8jqyzw52xh216fava5dhqvh0ib9"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh index c68a347e68ae..0a1cc0595f87 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index b48acec1d32b..39c892b33512 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -23,6 +23,7 @@ , libnotify , xdg-utils , mesa +, libglvnd , libappindicator-gtk3 }: @@ -68,7 +69,7 @@ in stdenv.mkDerivation (rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; + runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix deleted file mode 100644 index df75f7192bf7..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gtk4 -, glib -, gobject-introspection -, pkg-config -}: - -buildGoModule rec { - pname = "gotktrix"; - version = "unstable-2023-04-05"; - - src = fetchFromGitHub { - owner = "diamondburned"; - repo = pname; - rev = "a8f876a383cc34dac18edddbe22be2dd494b8d0c"; # compound - hash = "sha256-BuiA9UajdMhSrEfaXdu5DZlVhC4GVUdUpQDLMvKGrEk="; - }; - - vendorHash = "sha256-oo/j6i7slXILqyvj/EHojsyCZzJMGd10PTZaLvI1xoc="; - - buildInputs = [ - gtk4 - glib - ]; - - nativeBuildInputs = [ pkg-config gobject-introspection ]; - - # Checking requires a working display - doCheck = false; - - postPatch = '' - sed -i '/DBusActivatable/d' .nix/com.github.diamondburned.gotktrix.desktop - echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop - ''; - - postInstall = '' - install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/ - install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png - ''; - - meta = with lib; { - description = "Matrix client written in Go using GTK4"; - homepage = "https://github.com/diamondburned/gotktrix"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix deleted file mode 100644 index 8debefa0c11c..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, libGL, xcbutilkeysyms, xdg-utils, libtool }: - -let - version = "4.30.5.1682"; - - rpath = lib.makeLibraryPath [ - xdg-utils - xorg.libXext - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXrandr - xorg.libXdamage - xorg.libXrender - xorg.libXfixes - xorg.libXcomposite - xorg.libXcursor - xorg.libxcb - xorg.libXi - xorg.libXScrnSaver - xorg.libXtst - freetype - fontconfig - openssl - glib - nss - nspr - dbus - alsa-lib - zlib - libtool - libxml2 - libxslt - expat - xcbutilkeysyms - systemd - libGL - ] + ":${stdenv.cc.cc.lib}/lib64"; -in stdenv.mkDerivation { - pname = "hipchat"; - inherit version; - - src = fetchurl { - url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - ar x $src - tar xfvz data.tar.gz - - mkdir -p $out/libexec/hipchat - d=$out/libexec/hipchat/lib - mv opt/HipChat4/* $out/libexec/hipchat/ - mv usr/share $out - - for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true - patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true - done - - patchShebangs $d/linuxbrowserlaunch.sh - - substituteInPlace $out/share/applications/hipchat4.desktop \ - --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat - - makeWrapper $d/HipChat.bin $out/bin/hipchat \ - --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \ - --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \ - --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ - --set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess - - makeWrapper $d/QtWebEngineProcess.bin $d/QtWebEngineProcess \ - --set QT_PLUGIN_PATH "$d/plugins" - ''; - - meta = with lib; { - description = "Desktop client for HipChat services"; - homepage = "http://www.hipchat.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ puffnfresh ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix index af5cf167a62c..e90526c0a6aa 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -2,7 +2,6 @@ , cups , dpkg , fetchurl -, gjs , glib , gtk3 , lib @@ -11,6 +10,7 @@ , libgcrypt , libkrb5 , mesa # for libgbm +, libGL , nss , xorg , systemd @@ -19,7 +19,6 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook -, makeWrapper }: let @@ -43,8 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - # makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`. - (wrapGAppsHook.override { inherit makeWrapper; }) + wrapGAppsHook dpkg ]; @@ -76,7 +74,9 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/qq.desktop \ --replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/usr/share" "$out/share" - ln -s $out/opt/QQ/qq $out/bin/qq + makeWrapper $out/opt/QQ/qq $out/bin/qq \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" # Remove bundled libraries rm -r $out/opt/QQ/resources/app/sharp-lib @@ -91,13 +91,6 @@ stdenv.mkDerivation { runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gjs ]}" - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - ) - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix index b3ea2b3fe820..93bb928c28f3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,8 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-11-14 +# Last updated: 2023-12-05 { - version = "3.2.2-18394"; - urlhash = "fd2e886e"; - arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk="; - amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk="; + version = "3.2.3-19189"; + urlhash = "06d558c3"; + arm64_hash = "sha256-qNcw6P985F/JAB9roxaBR5hz2KcLiffUDKu/14nvvgE="; + amd64_hash = "sha256-37d7F1VB2puEFJC12x57aRj4NIYcCYyPCK06Z/OwNiM="; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index dccdf634b599..6565f89e93f1 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-P6ia7IU6OQJQXANy1snIZEqarKUcRmgbkP6L+UMwi+8="; + sha256 = "sha256-V1Sxfgn3fcqW7t7oa1pfnrPYAqHdCLrWUbplE/I789A="; }; desktopItem = (makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 63d8b250b96a..a05df511ab0a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.10"; + version = "3.9.11"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-VLHkFiIwfjCHr08wTsD8rMWSvHEswZCKl2XJr61cQYE="; + hash = "sha256-jyBHXzzFkCHGy8tdnE/daNbADYYAINBlC5td+wHOl4k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json deleted file mode 100644 index fbae80954e8b..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": "1.11.30-sc.2", - "rev": "v1.11.30-sc.2", - "srcHash": "1qb1fcr52gyzxndz3j77vn3ddwjpxwvicnh16c72zpzpfbbky7a5", - "webYarnHash": "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx", - "jsSdkYarnHash": "0p1whh3pmqz170l542fiq3zgljl5daa9b96i59p3wvggnx7kny7j", - "reactSdkYarnHash": "02ysshiyjj3w00b628is9bd7i8qc3vc8kr1zam2dpj26lb9k5pdd", - "desktopYarnHash": "16pzmlwzf3z8mky3wb4azaiggigyfnpxmbq3irjp30ic6yhl50yw" -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix deleted file mode 100644 index 86bc2d671eb0..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ lib -, element-desktop # for seshat and keytar -, schildichat-web -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, fetchYarnDeps -, yarn -, nodejs -, prefetch-yarn-deps -, electron -, Security -, AppKit -, CoreServices -, sqlcipher -}: - -let - pinData = lib.importJSON ./pin.json; - executableName = "schildichat-desktop"; -in -stdenv.mkDerivation rec { - pname = "schildichat-desktop"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "SchildiChat"; - repo = "schildichat-desktop"; - inherit (pinData) rev; - sha256 = pinData.srcHash; - fetchSubmodules = true; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/element-desktop/yarn.lock"; - sha256 = pinData.desktopYarnHash; - }; - - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper copyDesktopItems ]; - inherit (element-desktop) seshat keytar; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - pushd element-desktop - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - rm -rf node_modules/matrix-seshat node_modules/keytar - ln -s $keytar node_modules/keytar - ln -s $seshat node_modules/matrix-seshat - patchShebangs node_modules/ - popd - - runHook postConfigure - ''; - - # Only affects unused scripts in $out/share/element/electron/scripts. Also - # breaks because there are some `node`-scripts with a `npx`-shebang and - # this shouldn't be in the closure just for unused scripts. - dontPatchShebangs = true; - - buildPhase = '' - runHook preBuild - - pushd element-desktop - yarn --offline run build:ts - yarn --offline run i18n - yarn --offline run build:res - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # resources - mkdir -p "$out/share/element" - ln -s '${schildichat-web}' "$out/share/element/webapp" - mv element-desktop "$out/share/element/electron" - cp -r "$out/share/element/electron/res/img" "$out/share/element" - cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json - ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json - - # icons - for icon in $out/share/element/electron/build/icons/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/schildichat.png" - done - - # executable wrapper - # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "$out/share/element/electron" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - runHook postInstall - ''; - - # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/schildichat/element-desktop/blob/sc/package.json - desktopItems = [ - (makeDesktopItem { - name = "schildichat-desktop"; - exec = "${executableName} %u"; - icon = "schildichat"; - desktopName = "SchildiChat"; - genericName = "Matrix Client"; - comment = meta.description; - categories = [ "Network" "InstantMessaging" "Chat" ]; - startupWMClass = "schildichat"; - mimeTypes = [ "x-scheme-handler/element" ]; - }) - ]; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Matrix client / Element Desktop fork"; - homepage = "https://schildi.chat/"; - changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]); - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix deleted file mode 100644 index 0803bcc37791..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ stdenv, lib -, fetchFromGitHub -, fetchYarnDeps -, nodejs -, yarn -, prefetch-yarn-deps -, writeText, jq, conf ? {} -}: - -let - pinData = lib.importJSON ./pin.json; - noPhoningHome = { - disable_guests = true; # disable automatic guest account registration at matrix.org - }; - configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); - -in stdenv.mkDerivation rec { - pname = "schildichat-web"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "SchildiChat"; - repo = "schildichat-desktop"; - inherit (pinData) rev; - sha256 = pinData.srcHash; - fetchSubmodules = true; - }; - - webOfflineCache = fetchYarnDeps { - yarnLock = src + "/element-web/yarn.lock"; - sha256 = pinData.webYarnHash; - }; - jsSdkOfflineCache = fetchYarnDeps { - yarnLock = src + "/matrix-js-sdk/yarn.lock"; - sha256 = pinData.jsSdkYarnHash; - }; - reactSdkOfflineCache = fetchYarnDeps { - yarnLock = src + "/matrix-react-sdk/yarn.lock"; - sha256 = pinData.reactSdkYarnHash; - }; - - nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME - - pushd element-web - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $webOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - rm -rf node_modules/matrix-react-sdk - ln -s $PWD/../matrix-react-sdk node_modules/ - rm -rf node_modules/matrix-js-sdk - ln -s $PWD/../matrix-js-sdk node_modules/ - popd - - pushd matrix-js-sdk - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - popd - - pushd matrix-react-sdk - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules scripts - popd - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - pushd element-web - export VERSION=${version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mv element-web/webapp $out - jq -s '.[0] * .[1]' "configs/sc/config.json" "${configOverrides}" > "$out/config.json" - - runHook postInstall - ''; - - meta = with lib; { - description = "Matrix client / Element Web fork"; - homepage = "https://schildi.chat/"; - changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]); - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh deleted file mode 100755 index 6ddc99902c3b..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq - -if [[ "$#" -gt 2 || "$1" == -* ]]; then - echo "Regenerates packaging data for the SchildiChat packages." - echo "Usage: $0 [git revision or tag] [version string override]" - exit 1 -fi - -rev="$1" -version="$2" - -set -euo pipefail - -if [ -z "$rev" ]; then - rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -if [ -z "$version" ]; then - # strip leading "v" - version="${rev#v}" -fi - -src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev) -src=$(echo $src_data | jq -r .path) -src_hash=$(echo $src_data | jq -r .sha256) - -web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) -desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) -js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) -react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) - -cat > pin.json << EOF -{ - "version": "$version", - "rev": "$rev", - "srcHash": "$src_hash", - "webYarnHash": "$web_yarn_hash", - "jsSdkYarnHash": "$js_sdk_yarn_hash", - "reactSdkYarnHash": "$react_sdk_yarn_hash", - "desktopYarnHash": "$desktop_yarn_hash" -} -EOF 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 c545ac79a242..364843e7bfa8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,6 @@ -{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { - signal-desktop = { - dir = "Signal"; - version = "6.40.0"; - hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; - }; - signal-desktop-beta = { - dir = "Signal Beta"; - version = "6.40.0-beta.2"; - hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; - }; +{ hostPlatform, callPackage }: { + signal-desktop = if hostPlatform.system == "aarch64-linux" + then callPackage ./signal-desktop-aarch64.nix { } + else callPackage ./signal-desktop.nix { }; + signal-desktop-beta = callPackage ./signal-desktop-beta.nix{ }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 1d75bd542d6c..68c5552b251c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,8 +1,4 @@ -{ pname -, dir -, version -, hash -, stdenv +{ stdenv , lib , fetchurl , autoPatchelfHook @@ -51,8 +47,20 @@ , wayland }: -stdenv.mkDerivation rec { - inherit pname version; # Please backport all updates to the stable channel. +{ pname +, dir +, version +, hash +, url +}: + +let + inherit (stdenv) targetPlatform; + ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; +in stdenv.mkDerivation rec { + inherit pname version; + + # 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: @@ -61,8 +69,7 @@ stdenv.mkDerivation rec { # few additional steps and might not be the best idea.) src = fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; + inherit url hash; }; nativeBuildInputs = [ @@ -163,11 +170,14 @@ stdenv.mkDerivation rec { ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""} autoPatchelf --no-recurse -- "$out/lib/${dir}/" - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node" ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - passthru.tests.application-launch = nixosTests.signal-desktop; + passthru = { + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; meta = { description = "Private, simple, and secure messenger"; @@ -178,9 +188,9 @@ stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ mic92 equirosa urandom ]; + maintainers = with lib.maintainers; [ mic92 equirosa urandom bkchr ]; mainProgram = pname; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix new file mode 100644 index 000000000000..d69571928af8 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; + hash = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix new file mode 100644 index 000000000000..9b99f67e156a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop-beta"; + dir = "Signal Beta"; + version = "6.40.0-beta.2"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix new file mode 100644 index 000000000000..bfae729772f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh new file mode 100755 index 000000000000..37c0f33d12f7 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update curl coreutils jq + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +curl_github() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +case "$UPDATE_NIX_ATTR_PATH" in +signal-desktop) + latestTag=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest | jq -r ".tag_name") + latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + latestVersionAarch64=$(curl_github "https://api.github.com/repos/0mniteck/Signal-Desktop-Mobian/releases/latest" | jq -r ".tag_name") + + echo "Updating signal-desktop for x86_64-linux" + nix-update --version "$latestVersion" \ + --system x86_64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop.nix" \ + signal-desktop + + echo "Updating signal-desktop for aarch64-linux" + nix-update --version "$latestVersionAarch64" \ + --system aarch64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \ + signal-desktop + ;; +signal-desktop-beta) + latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") + latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')" + echo "Updating signal-desktop-beta for x86_64-linux" + nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta + ;; +*) + echo "Unknown attr path $UPDATE_NIX_ATTR_PATH" + ;; +esac diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 91be487a264f..b57392051d01 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: -(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20231114"; + version = "20231211"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-5ZDHAv8le1MLS394fto4Rg19J/b2QkZZ70Sn0Yap/hs="; + hash = "sha256-L8yfuaM/gyRknIM/ER0DfAZj6X9G0rAVVvAE9MtYF0g="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix index b15dbbb92bdb..2f362a4942c9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -16,6 +16,8 @@ let sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; + gradleWithJdk = gradle.override { java = jdk17_headless; }; + jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -39,7 +41,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradleWithJdk perl ]; patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -118,7 +120,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - nativeBuildInputs = [ git gradle makeWrapper ]; + nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; doCheck = true; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix index fcb59900ff00..c55178060fc8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "43.8.0.26955"; + version = "43.11.0.27795"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z"; - sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z"; + sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466"; }; nativeBuildInputs = [ 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 10af3d3ea4d3..8eae0b8a0d25 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.16.6.24664"; - versions.x86_64-darwin = "5.16.6.24664"; - versions.x86_64-linux = "5.16.6.382"; + versions.aarch64-darwin = "5.16.10.25689"; + versions.x86_64-darwin = "5.16.10.25689"; + versions.x86_64-linux = "5.16.10.668"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-5xccYYisVRZw7tJ6uri52BuaeURadaHypse4vjwPQIY="; + hash = "sha256-FIvUDbK1dwOdF8Y70Y3PHTxM/Kl5BMkmvNwcqbV+pog="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-N3jzvxoRY3W5fw1Fs0qevgHC+7cLLYvoGA/ZYiE71JA="; + hash = "sha256-z8nDNaJtSUtb/KeoxiSgU3HU/VY7JxGp9Ug5roD0y3U="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-2O8jGQHGyF5XLQUxHUWA3h9K792lRQmOC2mS0rTukSw="; + hash = "sha256-dZQHbpvU8uNafmHtGoPhj6WsDhO20Dma/XwY6oa3Xes="; }; }; |