From 7236bd9d62975e91a582ce525115de7eb9bce152 Mon Sep 17 00:00:00 2001 From: wrench-exile-legacy Date: Wed, 22 Jul 2026 12:23:40 +0100 Subject: [PATCH] mailspring: 1.22.0 -> 1.23.0 Diff: https://github.com/Foundry376/Mailspring/compare/1.22.0...1.23.0 Changelog: https://github.com/Foundry376/Mailspring/releases/tag/1.23.0 --- pkgs/by-name/ma/mailspring/bump-yauzl.patch | 217 ------------------ pkgs/by-name/ma/mailspring/package.nix | 16 +- ...rpm-deb-and-macos-package-generation.patch | 16 +- 3 files changed, 17 insertions(+), 232 deletions(-) delete mode 100644 pkgs/by-name/ma/mailspring/bump-yauzl.patch diff --git a/pkgs/by-name/ma/mailspring/bump-yauzl.patch b/pkgs/by-name/ma/mailspring/bump-yauzl.patch deleted file mode 100644 index 1a3fc9ab0489..000000000000 --- a/pkgs/by-name/ma/mailspring/bump-yauzl.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff --git a/app/package-lock.json b/app/package-lock.json -index 9b5b874..bc446b7 100644 ---- a/app/package-lock.json -+++ b/app/package-lock.json -@@ -570,16 +570,6 @@ - "ieee754": "^1.1.13" - } - }, -- "node_modules/buffer-crc32": { -- "version": "0.2.13", -- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", -- "license": "MIT", -- "peer": true, -- "engines": { -- "node": "*" -- } -- }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", -@@ -1581,16 +1571,6 @@ - "license": "MIT", - "peer": true - }, -- "node_modules/fd-slicer": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -- "license": "MIT", -- "peer": true, -- "dependencies": { -- "pend": "~1.2.0" -- } -- }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", -@@ -4575,14 +4555,16 @@ - } - }, - "node_modules/yauzl": { -- "version": "2.10.0", -- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", -+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", - "license": "MIT", - "peer": true, - "dependencies": { -- "buffer-crc32": "~0.2.3", -- "fd-slicer": "~1.1.0" -+ "pend": "~1.2.0" -+ }, -+ "engines": { -+ "node": ">=12" - } - } - } -diff --git a/app/package.json b/app/package.json -index 115cf61..436527d 100644 ---- a/app/package.json -+++ b/app/package.json -@@ -77,7 +77,9 @@ - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0" - }, -- "overrides": {}, -+ "overrides": { -+ "yauzl": "^3.3.1" -+ }, - "optionalDependencies": { - "windows-focus-assist": "^1.4.0" - } -diff --git a/package-lock.json b/package-lock.json -index fdc0d9d..31a4b5f 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -1893,14 +1893,6 @@ - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "license": "MIT" - }, -- "node_modules/buffer-crc32": { -- "version": "0.2.13", -- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", -- "engines": { -- "node": "*" -- } -- }, - "node_modules/buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -@@ -3446,14 +3438,6 @@ - "reusify": "^1.0.4" - } - }, -- "node_modules/fd-slicer": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", -- "dependencies": { -- "pend": "~1.2.0" -- } -- }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -@@ -5582,7 +5566,8 @@ - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", -+ "license": "MIT" - }, - "node_modules/picomatch": { - "version": "2.3.2", -@@ -7403,12 +7388,15 @@ - } - }, - "node_modules/yauzl": { -- "version": "2.10.0", -- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", -+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", -+ "license": "MIT", - "dependencies": { -- "buffer-crc32": "~0.2.3", -- "fd-slicer": "~1.1.0" -+ "pend": "~1.2.0" -+ }, -+ "engines": { -+ "node": ">=12" - } - }, - "node_modules/yocto-queue": { -@@ -8663,11 +8651,6 @@ - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" - }, -- "buffer-crc32": { -- "version": "0.2.13", -- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", -- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" -- }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -@@ -9692,7 +9675,7 @@ - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", -- "yauzl": "^2.10.0" -+ "yauzl": "^3.3.1" - }, - "dependencies": { - "get-stream": { -@@ -9745,14 +9728,6 @@ - "reusify": "^1.0.4" - } - }, -- "fd-slicer": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", -- "requires": { -- "pend": "~1.2.0" -- } -- }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -@@ -11158,7 +11133,7 @@ - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" -+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" - }, - "picomatch": { - "version": "2.3.2", -@@ -12389,12 +12364,11 @@ - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" - }, - "yauzl": { -- "version": "2.10.0", -- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", -+ "version": "3.4.0", -+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", -+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", - "requires": { -- "buffer-crc32": "~0.2.3", -- "fd-slicer": "~1.1.0" -+ "pend": "~1.2.0" - } - }, - "yocto-queue": { -diff --git a/package.json b/package.json -index 58a4e93..f065078 100644 ---- a/package.json -+++ b/package.json -@@ -82,5 +82,8 @@ - "test:e2e": "npx playwright test --config playwright/playwright.config.ts", - "tsc-watch": "tsc -w -p ./app --noEmit", - "build": "node app/build/build.js" -+ }, -+ "overrides": { -+ "yauzl": "^3.3.1" - } --} -\ No newline at end of file -+} diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index bf4e3ad2f1bd..68483b457314 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -5,6 +5,7 @@ callPackage, fetchFromGitHub, + actool, makeBinaryWrapper, pkg-config, wrapGAppsHook3, @@ -17,19 +18,17 @@ commandLineArgs ? "", }: let - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "Foundry376"; repo = "Mailspring"; tag = version; - hash = "sha256-32d0WIWqCsZlvuT+RDa3EYxkwTxWzQyLIfASiDfZnL8="; + hash = "sha256-GbY3lov3MT8c8LehEifzOH28VAYpBWDbwXrqEfFfwJg="; fetchSubmodules = true; }; patches = [ - # zip extraction fails on newer nodejs versions without this fix - ./bump-yauzl.patch ./remove-rpm-deb-and-macos-package-generation.patch ]; @@ -41,7 +40,7 @@ let pname = "mailspring-app"; inherit version src patches; postPatch = "cd app"; # we don't use sourceRoot so that we don't have to make the patch relative to it - npmDepsHash = "sha256-/caWmbN4Sl3DVPLXSaXrCHEyRsk/p3FwDqSZ7lfNgUk="; + npmDepsHash = "sha256-JkjtC4WT3cBsVlmrfO5WAxU1Xe3vXbxuNBDs2Q7fEck="; dontNpmBuild = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -67,13 +66,16 @@ buildNpmPackage (finalAttrs: { pname = "mailspring"; inherit version src patches; - npmDepsHash = "sha256-nHKFuTdk3qbAiSHksSo++mc8TMasspuym7MYxjuTTHI="; + npmDepsHash = "sha256-0cg/DT0MUbfzTq5hejH7auSk77M9Md7FWzidov8iyA4="; nativeBuildInputs = [ makeBinaryWrapper pkg-config wrapGAppsHook3 zip + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + actool ]; npmFlags = [ "--ignore-scripts" ]; @@ -133,7 +135,7 @@ buildNpmPackage (finalAttrs: { cp -r app/dist/*/resources $out/share/mailspring install -Dm444 app/dist/Mailspring.desktop $out/share/applications/Mailspring.desktop - install -Dm444 app/dist/mailspring.appdata.xml $out/share/metainfo/mailspring.appdata.xml + install -Dm444 app/dist/mailspring.metainfo.xml $out/share/metainfo/mailspring.metainfo.xml for size in 16 32 64 128 256 512; do install -Dm444 app/build/resources/linux/icons/$size.png \ diff --git a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch index 6df9c6519084..feac5cdc8821 100644 --- a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch +++ b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch @@ -1,6 +1,6 @@ -From 420f1f58734dbc7305f46b4d8089b461b79321b0 Mon Sep 17 00:00:00 2001 +From e1210102ab3f7bff24d9dfa38ad87b3fe04d0f5e Mon Sep 17 00:00:00 2001 From: wrench-exile-legacy -Date: Mon, 6 Jul 2026 22:40:30 +0100 +Date: Wed, 22 Jul 2026 10:38:53 +0100 Subject: [PATCH] remove rpm, deb and macos package generation --- @@ -8,10 +8,10 @@ Subject: [PATCH] remove rpm, deb and macos package generation 1 file changed, 17 deletions(-) diff --git a/app/build/build.js b/app/build/build.js -index 6d90aa5b2..ffec9cf8b 100644 +index 2e90d5624..d07244d75 100644 --- a/app/build/build.js +++ b/app/build/build.js -@@ -373,12 +373,6 @@ async function createMacZip() { +@@ -365,12 +365,6 @@ async function createMacZip() { } const arch = process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch; const cwd = path.join(outputDir, `Mailspring-darwin-${arch}`); @@ -24,8 +24,8 @@ index 6d90aa5b2..ffec9cf8b 100644 } function writeFromTemplate(filePath, data) { -@@ -422,11 +416,6 @@ async function createDebInstaller() { - writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), data); +@@ -415,11 +409,6 @@ async function createDebInstaller() { + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), data); const icon = path.join(appDir, 'build', 'resources', 'linux', 'icons', '512.png'); - await spawn({ @@ -36,10 +36,10 @@ index 6d90aa5b2..ffec9cf8b 100644 } async function createRpmInstaller() { -@@ -452,12 +441,6 @@ async function createRpmInstaller() { +@@ -446,12 +435,6 @@ async function createRpmInstaller() { writeFromTemplate(path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in'), templateData); writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), templateData); - writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), templateData); + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), templateData); - - await spawn({ - cmd: path.join(appDir, 'script', 'mkrpm'),