From 3bf9dadc729234086c7308514307f9367edbb696 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 17 May 2026 22:29:39 +0200 Subject: [PATCH] koodo-reader: 2.2.4 -> 2.3.4, use electron_41 (cherry picked from commit 315dca767f07f5079d247eb0b01e6d6e8200b29a) --- .../ko/koodo-reader/bump-abi-compat.patch | 55 +++++++++++-------- pkgs/by-name/ko/koodo-reader/package.nix | 14 ++--- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/ko/koodo-reader/bump-abi-compat.patch b/pkgs/by-name/ko/koodo-reader/bump-abi-compat.patch index c9e2ba143fd4..f1e33b59aafb 100644 --- a/pkgs/by-name/ko/koodo-reader/bump-abi-compat.patch +++ b/pkgs/by-name/ko/koodo-reader/bump-abi-compat.patch @@ -1,30 +1,30 @@ diff --git a/package.json b/package.json -index 3a001b5..c6ba849 100644 +index 4441e8b..269a8ed 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "repository": "https://github.com/koodo-reader/koodo-reader", "private": false, "resolutions": { -+ "nan": "2.24.0", -+ "node-abi": "3.85.0", - "//": "See https://github.com/facebook/create-react-app/issues/11773", - "react-error-overlay": "6.0.9" ++ "nan": "2.27.0", ++ "node-abi": "3.92.0", + "@types/react": "^18.3.1", + "node-gyp": "^10.0.0" }, @@ -22,7 +24,7 @@ "adm-zip": "^0.5.2", "axios": "^0.19.2", "basic-ftp": "^5.0.5", - "better-sqlite3": "^11.6.0", -+ "better-sqlite3": "^12.4.5", ++ "better-sqlite3": "^12.10.0", "buffer": "^6.0.3", "chardet": "^2.0.0", - "copy-text-to-clipboard": "^2.2.0", + "color-thief-browser": "^2.0.2", diff --git a/yarn.lock b/yarn.lock -index 83cf080..0dda6d2 100644 +index 6ced710..42e4e4f 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -5358,10 +5358,10 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: +@@ -5407,10 +5407,10 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: dependencies: tweetnacl "^0.14.3" @@ -32,14 +32,14 @@ index 83cf080..0dda6d2 100644 - version "11.6.0" - resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.6.0.tgz#e50736956e6fe1c30dc94f1bc94a9c15d63b7b6b" - integrity sha512-2J6k/eVxcFYY2SsTxsXrj6XylzHWPxveCn4fKPKZFv/Vqn/Cd7lOuX4d7rGQXT5zL+97MkNL3nSbCrIoe3LkgA== -+better-sqlite3@^12.4.5: -+ version "12.5.0" -+ resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.5.0.tgz#c570873d9635b5d56baa52f7e72634c2c589f35f" -+ integrity sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg== ++better-sqlite3@^12.10.0: ++ version "12.10.0" ++ resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-12.10.0.tgz#bde622d14a18008583a53bc53501ae98f1a12221" ++ integrity sha512-CyzaZRQKyHkB2ZInfTTl2nvT33EbDpjkLEbE8/Zck3Ll6O0qqvuGdrJ45HgtH+HykRg88ITY3AdreBGN70aBSQ== dependencies: bindings "^1.5.0" prebuild-install "^7.1.1" -@@ -10853,10 +10853,10 @@ mz@^2.7.0: +@@ -11041,10 +11041,10 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" @@ -47,18 +47,25 @@ index 83cf080..0dda6d2 100644 - version "2.22.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" - integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== -+nan@2.24.0, nan@^2.19.0, nan@^2.20.0: -+ version "2.24.0" -+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.24.0.tgz#a8919b36e692aa5b260831910e4f81419fc0a283" -+ integrity sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg== ++nan@2.27.0, nan@^2.19.0, nan@^2.20.0: ++ version "2.27.0" ++ resolved "https://registry.yarnpkg.com/nan/-/nan-2.27.0.tgz#804e389f4c0e39b729a17eca85c80ebc4355c4c4" ++ integrity sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ== nanoid@^3.3.6: version "3.3.6" -@@ -10906,17 +10906,10 @@ no-case@^3.0.4: +@@ -11094,24 +11094,10 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" --node-abi@^3.0.0, node-abi@^3.3.0: +-node-abi@^3.0.0: +- version "3.85.0" +- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.85.0.tgz#b115d575e52b2495ef08372b058e13d202875a7d" +- integrity sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg== +- dependencies: +- semver "^7.3.5" +- +-node-abi@^3.3.0: - version "3.71.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038" - integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw== @@ -69,10 +76,10 @@ index 83cf080..0dda6d2 100644 - version "3.74.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0" - integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w== -+node-abi@3.85.0, node-abi@^3.0.0, node-abi@^3.3.0, node-abi@^3.45.0: -+ version "3.85.0" -+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.85.0.tgz#b115d575e52b2495ef08372b058e13d202875a7d" -+ integrity sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg== ++node-abi@3.92.0, node-abi@^3.0.0, node-abi@^3.3.0, node-abi@^3.45.0: ++ version "3.92.0" ++ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.92.0.tgz#18e2214677499b8dda81ffcd095afc763d5a9802" ++ integrity sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ== dependencies: semver "^7.3.5" diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index c1013d200b71..25388db68402 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -14,23 +14,24 @@ wrapGAppsHook3, xcbuild, - electron_39, + electron_41, nix-update-script, }: let - electron = electron_39; # don't use latest electron to avoid going over the supported abi numbers + # don't use latest electron to avoid going over the supported abi numbers + electron = electron_41; in stdenv.mkDerivation (finalAttrs: { pname = "koodo-reader"; - version = "2.2.4"; + version = "2.3.4"; src = fetchFromGitHub { owner = "troyeguo"; repo = "koodo-reader"; tag = "v${finalAttrs.version}"; - hash = "sha256-KUcI+0+ICMdwAF30CLM3QdS+X8UnYiHhcYkvEQ6WgS8="; + hash = "sha256-GWhofLT5p8Li0aErJlUQ6E5xSkK4CnnM7UwGDJQBq9I="; }; patches = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src patches; - hash = "sha256-XyFcY0XeNdNzLuqfv9Z2/41875Nl5OrAT/QVyI/+OQc="; + hash = "sha256-HRWp/lXXPSw2OdvBaEX0W3hnxL9NvIjIk62Dj+rKm1g="; }; nativeBuildInputs = [ @@ -69,8 +70,6 @@ stdenv.mkDerivation (finalAttrs: { npm rebuild --verbose cpu-features export npm_config_nodedir=${electron.headers} - npm run postinstall - # Explicitly set identity to null to avoid signing on darwin yarn --offline run electron-builder --dir \ -c.mac.identity=null \ @@ -124,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { "image/vnd.djvu" "application/x-mobipocket-ebook" "application/vnd.amazon.ebook" - "application/vnd.amazon.ebook" "application/x-cbz" "application/x-cbr" "application/x-cbt"