From 34737cba685fc199953a5f9101d0ec5505b14054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Jun 2026 15:31:29 -0700 Subject: [PATCH 1/3] deltachat-desktop: use pnpm_10 --- pkgs/by-name/de/deltachat-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index b66b60db51b8..7d5f639fb079 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -8,7 +8,7 @@ makeWrapper, nodejs, pkg-config, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, python3, @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo="; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pkg-config pnpmConfigHook - pnpm_9 + pnpm_10 python3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ From e7e6095be18ccaf814314d48ddc37a94da97316a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Jun 2026 15:35:58 -0700 Subject: [PATCH 2/3] deltachat-tauri: use pnpm_10 --- pkgs/by-name/de/deltachat-tauri/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix index 039750226993..8194eaf8a6c3 100644 --- a/pkgs/by-name/de/deltachat-tauri/package.nix +++ b/pkgs/by-name/de/deltachat-tauri/package.nix @@ -12,7 +12,7 @@ openssl, perl, pkg-config, - pnpm_9, + pnpm_10, pnpmConfigHook, python3, rustPlatform, @@ -23,7 +23,7 @@ }: let - pnpm = pnpm_9; + pnpm = pnpm_10; in rustPlatform.buildRustPackage (finalAttrs: { pname = "deltachat-tauri"; @@ -38,10 +38,11 @@ rustPlatform.buildRustPackage (finalAttrs: { }; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; + pname = "deltachat-desktop"; + inherit (finalAttrs) version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y="; + fetcherVersion = 4; + hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo="; }; cargoHash = "sha256-JhsoIQZrU4GVcs/TCIug6y/84gODyEWl0Bl2jRNxL5Y="; From d81ee288f6d31163fd44ec51287ff4c529b2ff45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Jun 2026 15:41:26 -0700 Subject: [PATCH 3/3] deltachat-desktop: use __structuredAttrs and strictDeps --- pkgs/by-name/de/deltachat-desktop/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 7d5f639fb079..80aeb4f63933 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; version = "2.51.0"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "deltachat"; @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BSDeOkT75usLmXdAY8QNO+9YxxchrJH2gjFpTzErPXo="; }; + strictDeps = true; + nativeBuildInputs = [ yq makeWrapper