diff options
| author | Charlotte Van Petegem <charlotte.vanpetegem@ugent.be> | 2023-12-13 09:56:52 +0100 |
|---|---|---|
| committer | Charlotte Van Petegem <charlotte@vanpetegem.be> | 2023-12-26 14:59:49 +0100 |
| commit | d48cb1a5d297df0af34dafbd48424075c115fafd (patch) | |
| tree | 03499de7cdc912fce4abe8041ef1f4ba81cafeb5 | |
| parent | e173e2e409e2bcc977d8726178d7943dabb83ce0 (diff) | |
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 <lily@lily.flowers> (cherry picked from commit 7a9b7e9eec44e725cb97a3d446f7a0bcb0ba7654)
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 7 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 cfd2ce320aa23..6c0a669526505 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems , yarn , nodejs , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , electron , libpulseaudio , pipewire @@ -19,28 +20,37 @@ 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="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; + 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 = '' runHook preConfigure export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c4420786827e..6afa318f61a10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35744,7 +35744,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 { }; |