Merge master into staging-next

5 files changed, 52 insertions, 46 deletions

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 59ca619cabf8e..daed65d0c21d7 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -1,21 +1,24 @@
 # Expression generated by update.sh; do not edit it by hand!
-{ stdenv, callPackage }:
+{ stdenv, callPackage, ... }@args:
 
-if stdenv.isAarch64 then
-  callPackage ./make-brave.nix { } {
-    pname = "brave";
-    version = "1.64.116";
-    url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_arm64.deb";
-    hash = "sha256-XC3GnutiTYdCOJPegj8MRYC5dRrBoKBg4k50ZFrlj4E=";
-    platform = "aarch64-linux";
-  }
-else if stdenv.isx86_64 then
-  callPackage ./make-brave.nix { } {
-    pname = "brave";
-    version = "1.64.116";
-    url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_amd64.deb";
-    hash = "sha256-mnvFPfZu44TZGdUb+AxaJbecQrXkIzJkYvB4GO55uv0=";
-    platform = "x86_64-linux";
-  }
-else
-  throw "Unsupported platform."
+callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
+  (
+    if stdenv.isAarch64 then
+      {
+        pname = "brave";
+        version = "1.64.122";
+        url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_arm64.deb";
+        hash = "sha256-PBYiCTy/QaPfxvWAzUnXLEzBELISNSKX0kG/mYTDDEA=";
+        platform = "aarch64-linux";
+      }
+    else if stdenv.isx86_64 then
+      {
+        pname = "brave";
+        version = "1.64.122";
+        url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_amd64.deb";
+        hash = "sha256-9tSoOn9XGbX/b8n9vD9Hmpi26jzmUVJomoCFdSJoaoU=";
+        platform = "x86_64-linux";
+      }
+    else
+      throw "Unsupported platform."
+  )
diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh
index d850c2de688df..c0b8d7cff415b 100755
--- a/pkgs/applications/networking/browsers/brave/update.sh
+++ b/pkgs/applications/networking/browsers/brave/update.sh
@@ -19,24 +19,27 @@ hashAmd64="$(nix hash to-sri --type sha256 \
 
 cat > $SCRIPT_DIR/default.nix << EOF
 # Expression generated by update.sh; do not edit it by hand!
-{ stdenv, callPackage }:
+{ stdenv, callPackage, ... }@args:
 
-if stdenv.isAarch64 then
-  callPackage ./make-brave.nix { } {
-    pname = "brave";
-    version = "${latestVersionAarch64}";
-    url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAarch64}_arm64.deb";
-    hash = "${hashAarch64}";
-    platform = "aarch64-linux";
-  }
-else if stdenv.isx86_64 then
-  callPackage ./make-brave.nix { } {
-    pname = "brave";
-    version = "${latestVersionAmd64}";
-    url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb";
-    hash = "${hashAmd64}";
-    platform = "x86_64-linux";
-  }
-else
-  throw "Unsupported platform."
+callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
+  (
+    if stdenv.isAarch64 then
+      {
+        pname = "brave";
+        version = "${latestVersionAarch64}";
+        url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb";
+        hash = "${hashAarch64}";
+        platform = "aarch64-linux";
+      }
+    else if stdenv.isx86_64 then
+      {
+        pname = "brave";
+        version = "${latestVersionAmd64}";
+        url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb";
+        hash = "${hashAmd64}";
+        platform = "x86_64-linux";
+      }
+    else
+      throw "Unsupported platform."
+  )
 EOF
diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
index 42f979df17e16..184c699b6252b 100644
--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20240406";
+  version = "20240412-2";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = pname;
     rev = version;
-    hash = "sha256-Yc6QlEtN73zy3onckxC80QOmSrW5MPn4+rnWE7WEPug=";
+    hash = "sha256-e+QA8pqMz/XH+JpKErGYWKwsxHoFPTsFrSremfOaVbg=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index a5d3fc19bf3cb..18c7713589f0d 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -20,18 +20,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "teams-for-linux";
-  version = "1.4.17";
+  version = "1.4.22";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fpz3JzJ6RaSajCwc44Uavln572mT5ixLnIK8FFoKWMg=";
+    hash = "sha256-eNd12p9QvuYpiy9FaGaMSfQ3qVYzmYyO2/v/rdV3nN8=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-/8Jxly02EZxp5JZ3mVlv01aWX53V9eSy0pvVMfpb9I0=";
+    hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78=";
   };
 
   nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];
diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index ced76131e45b9..da92226507eeb 100644
--- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
@@ -11,7 +11,7 @@
 , configText ? ""
 }:
 let
-  version = "2312";
+  version = "2312.1";
 
   sysArch =
     if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -36,8 +36,8 @@ let
     pname = "vmware-horizon-files";
     inherit version;
     src = fetchurl {
-      url = "https://download3.vmware.com/software/CART24FQ4_LIN_2312_TARBALL/VMware-Horizon-Client-Linux-2312-8.12.0-23149323.tar.gz";
-      sha256 = "15ca1d6028b9ca88e23fa363a2942fd76456c19e95ced4734595c3dc44db38d8";
+      url = "https://download3.vmware.com/software/CART25FQ1_LIN_2312.1_TARBALL/VMware-Horizon-Client-Linux-2312.1-8.12.1-23543969.tar.gz";
+      sha256 = "23d18be2955ba60ab3cca941a529fa3b804af97ebf1602d246ca6147cced8135";
     };
     nativeBuildInputs = [ makeWrapper ];
     installPhase = ''