From b95655aa89d48eead61306ee09a4ca402c4caa16 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 9 Oct 2023 15:32:04 +0200 Subject: [PATCH 1/4] wire-desktop: linux 3.31.3060 -> 3.32.3079 --- .../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 2d1456842456..35b9187b8718 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -27,12 +27,12 @@ let version = { x86_64-darwin = "3.31.4556"; - x86_64-linux = "3.31.3060"; + x86_64-linux = "3.32.3079"; }.${system} or throwSystem; hash = { x86_64-darwin = "sha256-qRRdt/TvSvQ3RiO/I36HT+C88+ev3gFcj+JaEG38BfU="; - x86_64-linux = "sha256-9LdTsBOE1IJH0OM+Ag7GJADsFRgYMjbPXBH6roY7Msg="; + x86_64-linux = "sha256-+4aRis141ctI50BtBwipoVtPoMGRs82ENqZ+y2ZlL58="; }.${system} or throwSystem; meta = with lib; { From 38c38c7cd6c69800537716e620dc511da700120e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 9 Oct 2023 15:52:49 +0200 Subject: [PATCH 2/4] wire-desktop: mac 3.31.4556 -> 3.32.4589 --- .../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 35b9187b8718..c06a76a17929 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -26,12 +26,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.31.4556"; + x86_64-darwin = "3.32.4589"; x86_64-linux = "3.32.3079"; }.${system} or throwSystem; hash = { - x86_64-darwin = "sha256-qRRdt/TvSvQ3RiO/I36HT+C88+ev3gFcj+JaEG38BfU="; + x86_64-darwin = "sha256-PDAZCnkgzlausdtwycK+PHfp+zmL33VnX6RzCsgBTZ4="; x86_64-linux = "sha256-+4aRis141ctI50BtBwipoVtPoMGRs82ENqZ+y2ZlL58="; }.${system} or throwSystem; From eaee6450dab744a71b1614712f8d258a05e6881e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 9 Oct 2023 15:54:08 +0200 Subject: [PATCH 3/4] wire-desktop: Add aarch64-darwin platform --- .../instant-messengers/wire-desktop/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index c06a76a17929..2c75c5726505 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -25,13 +25,19 @@ let pname = "wire-desktop"; - version = { + version = let x86_64-darwin = "3.32.4589"; + in { + inherit x86_64-darwin; + aarch64-darwin = x86_64-darwin; x86_64-linux = "3.32.3079"; }.${system} or throwSystem; - hash = { + hash = let x86_64-darwin = "sha256-PDAZCnkgzlausdtwycK+PHfp+zmL33VnX6RzCsgBTZ4="; + in { + inherit x86_64-darwin; + aarch64-darwin = x86_64-darwin; x86_64-linux = "sha256-+4aRis141ctI50BtBwipoVtPoMGRs82ENqZ+y2ZlL58="; }.${system} or throwSystem; @@ -57,8 +63,7 @@ let kiwi toonn ]; - platforms = [ - "x86_64-darwin" + platforms = platforms.darwin ++ [ "x86_64-linux" ]; }; From 6353dfb56666e28ad8340543174b2daca5b32427 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 9 Oct 2023 15:55:42 +0200 Subject: [PATCH 4/4] wire-desktop: Stop caching binary package The build for a binary distribution like Wire Desktop is very light and having Hydra build and cache it is a bit of a waste of resources. We should follow Nixpkgs convention of not having Hydra build and therefore neither cache binary packages. --- .../networking/instant-messengers/wire-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 2c75c5726505..9aaba98710e3 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -66,6 +66,7 @@ let platforms = platforms.darwin ++ [ "x86_64-linux" ]; + hydraPlatforms = []; }; linux = stdenv.mkDerivation rec {