From bce77b92c607c68fda5606294317c3625671897e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 09:33:01 -0500 Subject: [PATCH 1/3] teams-for-linux: 1.11.0 -> 1.11.2 --- pkgs/by-name/te/teams-for-linux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 547af6be14c3..fd30eb96dde8 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; + hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI="; }; - npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; + npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o="; nativeBuildInputs = [ makeWrapper From edbaf29b2ae0e34bdc92df725454975c00358094 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:49:20 -0500 Subject: [PATCH 2/3] teams-for-linux: add versionCheckProgramArg Don't waste time calling --help --- pkgs/by-name/te/teams-for-linux/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index fd30eb96dde8..5150860c7a8c 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -109,6 +109,8 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; From 0cf4af90813d31923d775d5f319c6f24cf8afc1b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 18:40:40 -0500 Subject: [PATCH 3/3] teams-for-linux: electron 30 -> electron 32 Looks like upstream bumped electron version, already. --- pkgs/by-name/te/teams-for-linux/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 5150860c7a8c..77f8cf6e5f8b 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_30, + electron_32, makeDesktopItem, makeWrapper, nix-update-script, @@ -42,7 +42,7 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild - cp -r ${electron_30.dist} electron-dist + cp -r ${electron_32.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ @@ -50,7 +50,7 @@ buildNpmPackage rec { -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron_30.version} + -c.electronVersion=${electron_32.version} runHook postBuild ''; @@ -72,7 +72,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils