nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[26.05] electron_{41,42,43}: updates, electron_44: init at 44.3.0 (#555084)

Browse Source
This commit is contained in:
teutat3s
2026-09-24 21:29:40 +00:00
committed by GitHub
parent 1cba5443da 8e39062f76
commit eb29f4b39c
9 changed files with 1640 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/by-name/gc/gclient2nix/gclient2nix.py
View File

@@ -98,7 +98,7 @@ class Repo:
},
**{
f"checkout_{arch}": True
for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc", "riscv64"]
for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc", "riscv64", "s390"]
},
},
"",

4
pkgs/by-name/gc/gclient2nix/package.nix
View File

@@ -68,8 +68,8 @@ runCommand "gclient2nix"
# substitutions
depot_tools_checkout = fetchgit {
url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
rev = "1b1b01fa912786b88a79f3504176a275183839b5";
hash = "sha256-SRPeosetXYUklafhcuqsJiIKfItUJACG70m4Z5pBQiU=";
rev = "604a436d8af23ca0b9fd3d1d8be193fc9a4679f6";
hash = "sha256-tNJq/a4j0AHmn2FS4zbwkWeEMYlp4uXDcpPzP9D3ULE=";
};
passthru = {

58
pkgs/development/tools/electron/0001-Revert-build-stop-shipping-dummy-ANGLE-libs-in-Linux.patch Normal file
View File

@@ -0,0 +1,58 @@
From e624b5e2ff50227b78803d46dc1e35ebff1ee297 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sun, 6 Sep 2026 11:03:47 +0200
Subject: [PATCH] Revert "build: stop shipping dummy ANGLE libs in Linux dist
zip (#52226)"
This reverts commit b7b76b1afbfad5e1f1f777161a30a570ef7118a6.
---
electron/build/zip.py | 5 -----
electron/script/zip_manifests/dist_zip.linux.arm64.manifest | 2 ++
electron/script/zip_manifests/dist_zip.linux.x64.manifest | 2 ++
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/electron/build/zip.py b/electron/build/zip.py
index 94004ff835..4cf7b654c1 100644
--- a/electron/build/zip.py
+++ b/electron/build/zip.py
@@ -22,11 +22,6 @@ EXTENSIONS_TO_SKIP = [
PATHS_TO_SKIP = [
# Skip because it is an output of //ui/gl that we don't need.
'angledata',
- # Skip because ANGLE is statically linked; these are dummy stubs
- # that upstream generates only for Chromium bot infrastructure and nothing
- # loads them at runtime. See the TODO(crbug.com/514229803) in ui/gl/BUILD.gn.
- './libEGL',
- './libGLESv2',
# Skip because these are outputs that we don't need.
'./libVkICD_mock_',
# Skip because these are outputs that we don't need.
diff --git a/electron/script/zip_manifests/dist_zip.linux.arm64.manifest b/electron/script/zip_manifests/dist_zip.linux.arm64.manifest
index a1ad11ffea..224d2f036d 100644
--- a/electron/script/zip_manifests/dist_zip.linux.arm64.manifest
+++ b/electron/script/zip_manifests/dist_zip.linux.arm64.manifest
@@ -6,6 +6,8 @@ chrome_200_percent.pak
chrome_crashpad_handler
electron
icudtl.dat
+libEGL.so
+libGLESv2.so
libffmpeg.so
libvk_swiftshader.so
libvulkan.so.1
diff --git a/electron/script/zip_manifests/dist_zip.linux.x64.manifest b/electron/script/zip_manifests/dist_zip.linux.x64.manifest
index a1ad11ffea..224d2f036d 100644
--- a/electron/script/zip_manifests/dist_zip.linux.x64.manifest
+++ b/electron/script/zip_manifests/dist_zip.linux.x64.manifest
@@ -6,6 +6,8 @@ chrome_200_percent.pak
chrome_crashpad_handler
electron
icudtl.dat
+libEGL.so
+libGLESv2.so
libffmpeg.so
libvk_swiftshader.so
libvulkan.so.1
--
2.55.0

10
pkgs/development/tools/electron/binary/generic.nix
View File

@@ -170,6 +170,12 @@ let
$out/libexec/electron/electron \
$out/libexec/electron/chrome_crashpad_handler
# replace bundled vulkan-loader
rm "$out/libexec/electron/libvulkan.so.1"
ln -s -t "$out/libexec/electron" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
''
+ lib.optionalString (lib.versionOlder version "44") ''
# patch libANGLE
patchelf \
--set-rpath "${
@@ -180,10 +186,6 @@ let
]
}" \
$out/libexec/electron/lib*GL*
# replace bundled vulkan-loader
rm "$out/libexec/electron/libvulkan.so.1"
ln -s -t "$out/libexec/electron" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
'';
passthru.dist = finalAttrs.finalPackage + "/libexec/electron";

52
pkgs/development/tools/electron/binary/info.json
View File

@@ -34,35 +34,45 @@
},
"41": {
"hashes": {
"aarch64-darwin": "7d61175263f7aef8957b05966808ca58d3f0db86ba5a59aafc780ddd340135f6",
"aarch64-linux": "a77dc2804fda466e704907befa6facd8e7c9d0342db319c742ebb58ebe99a9c5",
"armv7l-linux": "b7ff0470b1efc424b96b81ecc3e7f353551bd1694bfbc75b307f319133f26258",
"headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
"x86_64-darwin": "719ad75b073bc34ff3c03694703a896c6ffdc40976c76efd959dfde108798150",
"x86_64-linux": "4b8eca04c7f96828e297d8b3b4d303727db9123ae69b86c6041418651b6c227f"
"aarch64-darwin": "7497a1f398c7bcac208fce96c73d297b1d63924624361a1a21930cd666cc4bbc",
"aarch64-linux": "b2b6528212e1e832889ea1493050ff5be04525cc2b8cb10161dfce83dd502c1f",
"armv7l-linux": "aea9f9d913f2992d711bd35e085f50381d1c049c2061920975ebe26d16e87927",
"headers": "0cjck5h3rdsn5s48c5gwp4mqg5xlja0hlsjz860vyym0jw8sw7hc",
"x86_64-darwin": "e48bb52a1694ba839d98239fe103bab7d90939b2afecc3672a5311b06cd88c03",
"x86_64-linux": "21bf93906685c77f350f618d034f33202f0764aabbfc204e6b724f82196537f9"
},
"version": "41.9.1"
"version": "41.10.7"
},
"42": {
"hashes": {
"aarch64-darwin": "e019b54b8b63dcc851adc871e011c45bf1510854266bb960dcff3781b24b6f96",
"aarch64-linux": "1575fa5cc64b3bf502d03632a915cdca4934e85d2b14fbf900752e8febfadd5c",
"armv7l-linux": "861d1ad6e41f395aac18deb6c2b36dd203c6364b7d2f358d5241a1ffeabd96d5",
"headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
"x86_64-darwin": "608f68cc8c5db54b7b3d853e3672a447bd7ad06d5b2caa9bc0a83d56479374fd",
"x86_64-linux": "3a729b020acb04aefac2c9b4b29c65b37dd7126a14a04d1ef29acb256d3edbd1"
"aarch64-darwin": "829a921e166f92c3486a56b2bc3b4b09e3fb9a28dee331f4d5766258528343ec",
"aarch64-linux": "b07e75414c8c24559451c1c901e16da9de8ae842d08cf472fd5f0ebc12e99344",
"armv7l-linux": "5923b738636711fde602ee0e5830cce9a22be9d16bc93f882720a3dedb088460",
"headers": "14vvshfrkfw57xh0nlw3q0m2571ckcmzvnz9k88hd881fzqhydra",
"x86_64-darwin": "f4809dc727aff78711dd3df6ea31429ff58c101408c0aa4a4d4adbbd3b75334d",
"x86_64-linux": "eea46e83e275fe38be7bd8068ea65750954d3c52330dd98719c09ddd4f60735f"
},
"version": "42.5.1"
"version": "42.11.3"
},
"43": {
"hashes": {
"aarch64-darwin": "2ee24f768c41bc2ed9bd580d7797b185dffb550dafca59c2cd08b51965bcda3a",
"aarch64-linux": "78799ae4fdc7969acb152aa0f33f39bd5eaca2de3eafe817a13487b872abe43c",
"armv7l-linux": "1f32ac165dd1d01f1dcb8bfb881503369c7b739dd292034ef61e2ea75b852a2c",
"headers": "1xqgvsj7pq2j5yvg0yxa4l5l276dmj9zlpxmvy2g993bdypxj8zi",
"x86_64-darwin": "c84cd358a6c58ee9d6ce26ced694ab3b750109e9f29145ff5a639db64037f1de",
"x86_64-linux": "be56b5b8451bda585b56e6a6a67757da2cb7ead59f036b6000431a51c0e0c79b"
"aarch64-darwin": "5183a2b15d013517386edd9f1ea8e3402755f6c3ea17893f92acb20052f3a2e7",
"aarch64-linux": "e8b4ef7acdfb3f254463f832dded44c17cb8c65f790d0377e8c04f91bbeeb3a4",
"armv7l-linux": "121f21827d46d329fd1d6c9d1c45cefc7af436bd51b97b24cc0b4253b6e02e6f",
"headers": "1lfm4byj4yw6va7mkj34q1qwdha8x88ns3c605jl0x4k1kfm3xpd",
"x86_64-darwin": "27f0ba89978e6a8a2fea212f8be8b114a60f5747df41f42f424b8b0131477ec4",
"x86_64-linux": "3075c82d0749e136bca77563d4dd24e881714d17d98241fafd02320da5d6e237"
},
"version": "43.1.0"
"version": "43.6.0"
},
"44": {
"hashes": {
"aarch64-darwin": "49b91ef265c603c8888500f807484b63816069c30f87ba2b403e7c87f0f45035",
"aarch64-linux": "c11fde221c08e9bffdb3336579f09bd934a009862f509af5033616876741be24",
"headers": "0pns4rylzr1a330cjmmcgyvdh19glhrgp2723gpi08xq027anrh8",
"x86_64-darwin": "6e3278d96377085af532380e2b23a38cdcf4c58b4efb3f6ada2f251db95c9560",
"x86_64-linux": "8b49b9efdd73c0f467edc3c1cd5678392c384ccf224f34ff54179f736e2f384b"
},
"version": "44.3.0"
}
}

52
pkgs/development/tools/electron/chromedriver/info.json
View File

@@ -34,35 +34,45 @@
},
"41": {
"hashes": {
"aarch64-darwin": "d270db29c9bd72cb796600510283ff3ba3a57b454a3565508492fa590eec2df5",
"aarch64-linux": "bf33e3258036e2fff74795be213060858fdf37f2c61ddfe551289697d7d8b528",
"armv7l-linux": "0e65fd875ce97a9bc9241bd7c3476bcdccd22b90da2bc9d5bff6282372c55efe",
"headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h",
"x86_64-darwin": "d9b5d5c960caf575cdc26dd35edfbd8078198d8b9ba5dfd9653c3753187b5485",
"x86_64-linux": "6060783bb08fc89cececf9731290b3f22b6ff847b2577f5cbd768ee8bb3fdee3"
"aarch64-darwin": "b49ed051b571afba48e2b39815204401048f2fa4b8241f8332d4d9a41e9e39bd",
"aarch64-linux": "d835aae28d5c58663d8df422de7cc8cf6e6eafab14fbc441794f0ad6af791f58",
"armv7l-linux": "8f22126c4f5185ec4143613967dafbce8dc35f63d35332039f4f1cf0cb4de099",
"headers": "0cjck5h3rdsn5s48c5gwp4mqg5xlja0hlsjz860vyym0jw8sw7hc",
"x86_64-darwin": "aa836f024a7217dfdda095faf61c5df131b51dc1e7072cf3cacb535ec8390719",
"x86_64-linux": "7929c06013b9312e660e0c39c802e1de42543e6f4b9b3a1560bb200269ca6607"
},
"version": "41.9.1"
"version": "41.10.7"
},
"42": {
"hashes": {
"aarch64-darwin": "6bc1ce38660096ac4e669e0acf79abd9de22d180fd9f018babaa5da76668a80f",
"aarch64-linux": "859700b9cb1e98f70208baa92e431eb1d102bd27621a5a695aa7a75327e072e6",
"armv7l-linux": "308bd2664d9797512e93f9b2ed17bf62fae9e12cd12ff6812b4493d388cd0904",
"headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0",
"x86_64-darwin": "21db8529629a1a69fc5e2b6475d99c44985a78d49b7cc7aa314465d7568d78a6",
"x86_64-linux": "e0db56b8781035a48aae7fefdac311abb8993a7f6e72009e7adfb70926565bf0"
"aarch64-darwin": "ccb254d7be31327137ba0ca7550b4ab3881fc5392e91fcc70fe30887dda7dc87",
"aarch64-linux": "c490ddc2f45125dd610707c5cdcfec107d5da872fce72954179948e4afc74842",
"armv7l-linux": "634afe67b72ca4a853c9848861a07d9896bf9c6a02c354e35cbf72c6f3df07e2",
"headers": "14vvshfrkfw57xh0nlw3q0m2571ckcmzvnz9k88hd881fzqhydra",
"x86_64-darwin": "c2f1a1fcc466c959caed38658187ee3f4bbec7a9eaf1b05c9de8d5f1304104ac",
"x86_64-linux": "655911685cdcaf74210ded16dd1dc3785555b6160a5916a929fb9a843e36ee82"
},
"version": "42.5.1"
"version": "42.11.3"
},
"43": {
"hashes": {
"aarch64-darwin": "733c8fd5b80e761739cc776c1c6777115bd39cf86d825e895d996734ee3f3515",
"aarch64-linux": "7bdc6d18aafb3aa434374998bbfccdd2087b9495745dd134c06e5f74eafa95d5",
"armv7l-linux": "77a395bb4f4046fb43de81e9eac4b3f5d7d0f5911f2262bcd110bfe2ad1f3076",
"headers": "1xqgvsj7pq2j5yvg0yxa4l5l276dmj9zlpxmvy2g993bdypxj8zi",
"x86_64-darwin": "1450a8af80b7d4c66a4b85779090ce80e1e1b52dacef5dd89322a10b07fe4848",
"x86_64-linux": "e946ae6cad7dc279431e841e0bc19ba4e0dc16a82c5a9c1f7c4d9f3925e5b39a"
"aarch64-darwin": "b3117435ab234ba667ef94cf067abe9a3e0801858bf8f73e4e55e047168f9789",
"aarch64-linux": "1f2a73c9093a0ff2fe7fc88af940c7b93995e6f592fadbe3b2fcb524f311b081",
"armv7l-linux": "f930411e9c33954cc5ce299286464a145e7338099c3ee6f644bf88230d737d42",
"headers": "1lfm4byj4yw6va7mkj34q1qwdha8x88ns3c605jl0x4k1kfm3xpd",
"x86_64-darwin": "2828a21ea4e7a34f346f021744a2dc2bf07d0b4ffee22e913d683afa2fb64d19",
"x86_64-linux": "2c5a54f26c6d18f9b4585a39195c5b371326094ecb0b788102b64d370ee7e342"
},
"version": "43.1.0"
"version": "43.6.0"
},
"44": {
"hashes": {
"aarch64-darwin": "4ddb6a5f9c5f5c2bd3897aa36a63a161ef350e4f38bd118acfa924ad6e98f75f",
"aarch64-linux": "cecf416116f2273461e10b0f14eaa2318e6b66e44b6bbe7439866ce1bf6bc4e7",
"headers": "0pns4rylzr1a330cjmmcgyvdh19glhrgp2723gpi08xq027anrh8",
"x86_64-darwin": "b549a5916a630f879b6837a6d52947d679598b5b90b2317013f7cb1dc6f3cf8a",
"x86_64-linux": "53167b1bdf4c7887b29b228c0b5f3f43704d9c8917859c42fe98da97cf03e444"
},
"version": "44.3.0"
}
}

11
pkgs/development/tools/electron/common.nix
View File

@@ -106,6 +106,13 @@ in
src = null;
patches =
base.patches
++
# Restore fake libGLESv2.so which is patchelf'd by the chromium derivation
lib.optional (lib.versionAtLeast info.version "44")
./0001-Revert-build-stop-shipping-dummy-ANGLE-libs-in-Linux.patch;
postPatch = ''
mkdir -p third_party/jdk/current/bin
@@ -231,13 +238,11 @@ in
v8_expose_public_symbols = true;
enable_linux_installer = false;
enable_pdf_save_to_drive = false;
node_openssl_path = "//third_party/boringssl";
}
// lib.optionalAttrs (lib.versionOlder info.version "43") {
enterprise_cloud_content_analysis = false;
}
// lib.optionalAttrs (lib.versionAtLeast info.version "43") {
node_openssl_path = "//third_party/boringssl";
}
// {
# other

1538
pkgs/development/tools/electron/info.json
View File

File diff suppressed because it is too large Load Diff

7
pkgs/top-level/all-packages.nix
View File

@@ -5123,6 +5123,7 @@ with pkgs;
electron_41-bin
electron_42-bin
electron_43-bin
electron_44-bin
;
inherit (callPackages ../development/tools/electron/chromedriver { })
@@ -5132,6 +5133,7 @@ with pkgs;
electron-chromedriver_41
electron-chromedriver_42
electron-chromedriver_43
electron-chromedriver_44
;
inherit
@@ -5163,6 +5165,10 @@ with pkgs;
src = electron-source.electron_43;
bin = electron_43-bin;
};
electron_44 = getElectronPkg {
src = electron-source.electron_44;
bin = electron_44-bin;
};
}
)
electron_38
@@ -5171,6 +5177,7 @@ with pkgs;
electron_41
electron_42
electron_43
electron_44
;
electron = electron_43;
electron-bin = electron_43-bin;