From d107b05be09495d7e4dea83fb7f24d0c20befccb Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 25 Jun 2026 23:03:47 -0700 Subject: [PATCH] =?UTF-8?q?zulip:=205.12.3=20=E2=86=92=205.12.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #526892; refs #521305. Signed-off-by: Anders Kaseorg --- pkgs/by-name/zu/zulip/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 14cd14a49b54..9d1fca11cf12 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -4,39 +4,40 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm_10_29_2, + pnpm_11, pnpmConfigHook, python3, - electron_39, + electron_42, makeDesktopItem, makeBinaryWrapper, copyDesktopItems, }: let - electron = electron_39; + electron = electron_42; + pnpm = pnpm_11; in stdenv.mkDerivation (finalAttrs: { pname = "zulip"; - version = "5.12.3"; + version = "5.12.4"; src = fetchFromGitHub { owner = "zulip"; repo = "zulip-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-jRco2eyQrWf5jGvdWYn4mt8FD/xu1+FftQoB3wuF2Lw="; + hash = "sha256-0TQKQfjfA1Nn/xvtHF0t6i+whLkyu1kVwuZ62Z0AZgk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10_29_2; - fetcherVersion = 3; - hash = "sha256-s/KllzT46L2o4SWS3z3Z7FDQD6FEEEAnPdM6tsfGRUo="; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-D9Ge0Ao1fnVA1hk+K1ScZ3iCnl1+iqUtZSG5ACO2H2M="; }; nativeBuildInputs = [ nodejs - pnpm_10_29_2 + pnpm pnpmConfigHook makeBinaryWrapper copyDesktopItems @@ -46,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - npm_config_nodedir=${electron.headers} \ - node --run pack -- \ + pnpm exec electron-vite build + npm_package_config_node_gyp_nodedir=${electron.headers} \ + pnpm exec electron-builder --dir \ -c.electronDist=${electron.dist} \ -c.electronVersion=${electron.version}