From 48a343fed34f97c05c8c3779e8896bf304577e3f Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 8 Nov 2022 11:32:34 +0100 Subject: [PATCH 1/6] wire-desktop: linux 3.29.2997 -> 3.29.3004 (cherry picked from commit f54eac6053bd57d257cf38129c3e5de340c502ab) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 7c4b95a06459..869ee476c88e 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -24,12 +24,12 @@ let version = { x86_64-darwin = "3.29.4477"; - x86_64-linux = "3.29.2997"; + x86_64-linux = "3.29.3004"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "19snbd53hjfcqgnz24r85a34fr120b1wps4pv4vymnkxjld2wifc"; - x86_64-linux = "0f5kkp93za4yr6ywdgph8zr6ivrbxq2gbskl8jysxawk1pz92pqf"; + x86_64-linux = "02cv5xl0yswa23nl6a0yajyc4032wpfyih39vbfang9ig7mc71ai"; }.${system} or throwSystem; meta = with lib; { From 31e1cd78044c3e4902a83d9c6bb7d94f64fd0590 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 8 Nov 2022 11:34:31 +0100 Subject: [PATCH 2/6] wire-desktop: mac 3.29.4477 -> 3.29.4490 (cherry picked from commit c08bef1fc110f2e580056be45b99f1be76d740ca) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 869ee476c88e..6495f9930eff 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.29.4477"; + x86_64-darwin = "3.29.4490"; x86_64-linux = "3.29.3004"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "19snbd53hjfcqgnz24r85a34fr120b1wps4pv4vymnkxjld2wifc"; + x86_64-darwin = "0sz7zgs6gnb9naivdvkvpb1d6xhgh681h8qhgas18xnnp1kk60ad"; x86_64-linux = "02cv5xl0yswa23nl6a0yajyc4032wpfyih39vbfang9ig7mc71ai"; }.${system} or throwSystem; From 34bff949c07cb8d8252cbed474208d2a1d51faf9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 23 Dec 2022 12:06:12 +0100 Subject: [PATCH 3/6] wire-desktop: linux 3.29.3004 -> 3.30.3018 (cherry picked from commit e3587c4eb77a55fa68963425edf1c41e63210213) --- .../networking/instant-messengers/wire-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 6495f9930eff..315b1d2c5dc3 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -24,12 +24,12 @@ let version = { x86_64-darwin = "3.29.4490"; - x86_64-linux = "3.29.3004"; + x86_64-linux = "3.30.3018"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "0sz7zgs6gnb9naivdvkvpb1d6xhgh681h8qhgas18xnnp1kk60ad"; - x86_64-linux = "02cv5xl0yswa23nl6a0yajyc4032wpfyih39vbfang9ig7mc71ai"; + x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ="; }.${system} or throwSystem; meta = with lib; { @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/" - + "Wire-${version}_amd64.deb"; + + "Wire-${version}_amd64.deb"; inherit sha256; }; From 9c5ee6c94314e2e47defec3c9edc77e318147f63 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 23 Dec 2022 12:12:39 +0100 Subject: [PATCH 4/6] wire-desktop: mac: use SRI hash (cherry picked from commit 466e19114b579e192b1e8f75d886d3b5b344ab65) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 315b1d2c5dc3..23cc0ca624b3 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -28,7 +28,7 @@ let }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0sz7zgs6gnb9naivdvkvpb1d6xhgh681h8qhgas18xnnp1kk60ad"; + x86_64-darwin = "sha256-TQEzZ7jWdhS0ehAjGJCBD3bTwrp77rajsmnZZ/T752s="; x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ="; }.${system} or throwSystem; @@ -133,7 +133,7 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + + "macos%2F${version}/Wire.pkg"; inherit sha256; }; From 57b7b9a54bb2994dbcc6a26d7e37b43b7c600c70 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 23 Dec 2022 12:13:28 +0100 Subject: [PATCH 5/6] wire-desktop: use hash instead of sha256 With everything being SRI hashes, we can use `hash` now. (cherry picked from commit aee59c734ea5d99cd2c7b5b17f137ea35b35d941) --- .../networking/instant-messengers/wire-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 23cc0ca624b3..c579a0f34567 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -27,7 +27,7 @@ let x86_64-linux = "3.30.3018"; }.${system} or throwSystem; - sha256 = { + hash = { x86_64-darwin = "sha256-TQEzZ7jWdhS0ehAjGJCBD3bTwrp77rajsmnZZ/T752s="; x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ="; }.${system} or throwSystem; @@ -66,7 +66,7 @@ let src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/" + "Wire-${version}_amd64.deb"; - inherit sha256; + inherit hash; }; desktopItem = makeDesktopItem { @@ -134,7 +134,7 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" + "macos%2F${version}/Wire.pkg"; - inherit sha256; + inherit hash; }; buildInputs = [ From e8944f566fbe7b992e886304e093884665054bec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 23 Dec 2022 12:22:22 +0100 Subject: [PATCH 6/6] wire-desktop: mac: 3.29.4490 -> 3.30.3018 (cherry picked from commit 57dd90cecb255745a58be267da52181acc40ae74) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index c579a0f34567..6fdc64adc135 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.29.4490"; + x86_64-darwin = "3.30.4506"; x86_64-linux = "3.30.3018"; }.${system} or throwSystem; hash = { - x86_64-darwin = "sha256-TQEzZ7jWdhS0ehAjGJCBD3bTwrp77rajsmnZZ/T752s="; + x86_64-darwin = "sha256-+htDeNIuucB4qzNBNYoSUH1DbfgouZS08G5hxPtIuzY="; x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ="; }.${system} or throwSystem;