From 7a9b7e9eec44e725cb97a3d446f7a0bcb0ba7654 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 13 Dec 2023 09:56:52 +0100 Subject: [PATCH] teams-for-linux: 1.3.22 -> 1.4.1 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.23 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.24 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.25 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.26 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.27 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.4.0 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.4.1 Co-Authored-By: Lily Foster --- .../teams-for-linux/default.nix | 17 ++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) 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 ed8ed3032781..a859efd3fae7 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems @@ -19,20 +20,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.22"; + version = "1.4.1"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A="; + hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc="; + hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA="; }; + patches = [ + # remove when IsmaelMartinez/teams-for-linux#1058 is merged + (fetchpatch { + name = "teams-for-linux-fix-version.patch"; + url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff"; + hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg="; + }) + ]; + + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dc814930760..1e0345a0ac26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35678,7 +35678,7 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { - electron = electron_27; + electron = electron_28; }; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };