From cc17817b3010bad5569a763ee2f0bf3c370710c5 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 28 Jun 2026 16:59:52 +0200 Subject: [PATCH] stoat-desktop: fix build with newer nodejs versions by bumping yauzl --- .../by-name/st/stoat-desktop/bump-yauzl.patch | 123 ++++++++++++++++++ pkgs/by-name/st/stoat-desktop/package.nix | 14 +- 2 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/st/stoat-desktop/bump-yauzl.patch diff --git a/pkgs/by-name/st/stoat-desktop/bump-yauzl.patch b/pkgs/by-name/st/stoat-desktop/bump-yauzl.patch new file mode 100644 index 000000000000..01fcc933bd93 --- /dev/null +++ b/pkgs/by-name/st/stoat-desktop/bump-yauzl.patch @@ -0,0 +1,123 @@ +diff --git a/package.json b/package.json +index d0f7837..fbdcb92 100644 +--- a/package.json ++++ b/package.json +@@ -55,5 +55,10 @@ + "update-electron-app": "^3.1.1", + "utf-8-validate": "^6.0.5" + }, ++ "pnpm": { ++ "overrides": { ++ "yauzl": "^3.3.1" ++ } ++ }, + "packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34" +-} +\ No newline at end of file ++} +diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml +index 9c7ff44..7e9007d 100644 +--- a/pnpm-lock.yaml ++++ b/pnpm-lock.yaml +@@ -4,6 +4,9 @@ settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + ++overrides: ++ yauzl: ^3.3.1 ++ + importers: + + .: +@@ -1086,9 +1089,6 @@ packages: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} + engines: {node: '>=8'} + +- buffer-crc32@0.2.13: +- resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} +- + buffer-from@1.1.2: + resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + +@@ -1575,9 +1575,6 @@ packages: + fastq@1.19.1: + resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==} + +- fd-slicer@1.1.0: +- resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} +- + figures@2.0.0: + resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==} + engines: {node: '>=4'} +@@ -1722,7 +1719,7 @@ packages: + + glob@7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} +- deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me ++ deprecated: Glob versions prior to v9 are no longer supported + + glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} +@@ -2883,7 +2880,7 @@ packages: + tar@6.2.1: + resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} + engines: {node: '>=10'} +- deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me ++ deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me + + temp@0.9.4: + resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==} +@@ -3174,8 +3171,9 @@ packages: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + +- yauzl@2.10.0: +- resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} ++ yauzl@3.4.0: ++ resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} ++ engines: {node: '>=12'} + + yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} +@@ -4439,8 +4437,6 @@ snapshots: + dependencies: + fill-range: 7.1.1 + +- buffer-crc32@0.2.13: {} +- + buffer-from@1.1.2: {} + + buffer@5.7.1: +@@ -5110,7 +5106,7 @@ snapshots: + dependencies: + debug: 4.4.3 + get-stream: 5.2.0 +- yauzl: 2.10.0 ++ yauzl: 3.4.0 + optionalDependencies: + '@types/yauzl': 2.10.3 + transitivePeerDependencies: +@@ -5136,10 +5132,6 @@ snapshots: + dependencies: + reusify: 1.1.0 + +- fd-slicer@1.1.0: +- dependencies: +- pend: 1.2.0 +- + figures@2.0.0: + dependencies: + escape-string-regexp: 1.0.5 +@@ -6839,10 +6831,9 @@ snapshots: + y18n: 5.0.8 + yargs-parser: 21.1.1 + +- yauzl@2.10.0: ++ yauzl@3.4.0: + dependencies: +- buffer-crc32: 0.2.13 +- fd-slicer: 1.1.0 ++ pend: 1.2.0 + + yocto-queue@0.1.0: {} + diff --git a/pkgs/by-name/st/stoat-desktop/package.nix b/pkgs/by-name/st/stoat-desktop/package.nix index 998282b00828..d7a4998172b7 100644 --- a/pkgs/by-name/st/stoat-desktop/package.nix +++ b/pkgs/by-name/st/stoat-desktop/package.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-l4kxlPwohaxserVyNAb3Dp4f5XhnPUKeuRJwrOl9EWc="; }; + patches = [ + # zip extraction fails on newer nodejs versions without this fix + ./bump-yauzl.patch + ]; + postPatch = '' # Disable auto-updates sed -i '/updateElectronApp([^)]*)/d' src/main.ts @@ -54,10 +59,15 @@ stdenv.mkDerivation (finalAttrs: { ]; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) + pname + version + src + patches + ; fetcherVersion = 3; pnpm = pnpm_10; - hash = "sha256-bIDwEmt/8URBMx7XIQ1EP4SucwMuyGZE1hlQM0rxDnw="; + hash = "sha256-0v+MHYFgnIN4FvzFkv5D3Bqc7538763yCIWu05XR+fA="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";