From 7b452b5d39284b6b3d1a89abddd8592b1fc44bd3 Mon Sep 17 00:00:00 2001 From: mulatta <67085791+mulatta@users.noreply.github.com> Date: Thu, 2 Jul 2026 17:40:01 +0900 Subject: [PATCH] dorion: build with pnpm 10 pnpm_9 is marked insecure, making Dorion refuse to evaluate under default settings. Switch to current pnpm_10 and update the vendored dependency hash. pnpm 10 asks before purging node_modules in non-interactive builds, so set CI=true to keep Nix builds unattended. --- pkgs/by-name/do/dorion/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c184d89ca1fc..5298922e475b 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -16,7 +16,7 @@ openssl, pkg-config, yq-go, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, webkitgtk_4_1, @@ -60,9 +60,9 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; + pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o="; + hash = "sha256-WzJD2Brg7+cx7TXRpEg2c1QSY0uo0Ppulj3ytdl0A4I="; }; # CMake (webkit extension, Linux only) @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 cargo-tauri.hook nodejs pkg-config @@ -189,6 +189,8 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; env = { + # pnpm 10 prompts before purging node_modules in non-interactive builds. + CI = "true"; TAURI_RESOURCE_DIR = "${placeholder "out"}/lib"; };