From 55cde22d62f55f00199736a9abf1386f3c6dd484 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Fri, 4 Apr 2025 10:47:59 +0100 Subject: [PATCH 1/2] protonmail-bridge: 3.18.0 -> 3.19.0 --- pkgs/by-name/pr/protonmail-bridge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 80842c582a8d..4e3a5558a601 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-qLxIXAGa1nqLOroz5VYWktznId+vfOPvHpUT/oVPD8M="; + hash = "sha256-Jx6yzn3QNOVz/VM8dqmTm4Upzz46aNo9d6lvhjLwdL4="; }; vendorHash = "sha256-S08Vw/dLLVd6zFWmpG8wDVf7LOdSC29qo7pUscYHDyY="; From 2132639e6916f7ce1c40ac2c5a98e39ad12e432e Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Fri, 4 Apr 2025 11:12:34 +0100 Subject: [PATCH 2/2] protonmail-bridge-gui: use regex for ICU version matching Replace specific ICU version match (.56 -> .73) with regex pattern \.[0-9][0-9] to match any 2-digit version number (10-99). This aligns with upstream's "BRIDGE-316: Update Qt to latest LTS version 6.8.2" while future-proofing for subsequent ICU versions. ICU (International Components for Unicode) provides Unicode support. Binary compatibility is supported from ICU 3.0 onward, making this approach appropriate. Using generic .so symlinks offers flexibility with any compatible ICU version available on the system. --- pkgs/by-name/pr/protonmail-bridge-gui/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 3d159ffb6459..d8d87b4909b2 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { find . -type f -name "CMakeLists.txt" -exec sed -i "/BridgeSetup\\.cmake/d" {} \; # Use the available ICU version - sed -i "s/libicu\(i18n\|uc\|data\)\.so\.56/libicu\1.so/g" bridge-gui/DeployLinux.cmake + sed -i "s/libicu\(i18n\|uc\|data\)\.so\.[0-9][0-9]/libicu\1.so/g" bridge-gui/DeployLinux.cmake # Create a Desktop Entry that uses a `protonmail-bridge-gui` binary without upstream's launcher sed "s/^\(Icon\|Exec\)=.*$/\1=protonmail-bridge-gui/" ../../../dist/proton-bridge.desktop > proton-bridge-gui.desktop