gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electron_42: init at 42.1.0, electron_{39,40,41}: updates (#517263)

Browse Source
This commit is contained in:
yaya
2026-05-18 09:09:17 +00:00
committed by GitHub
parent aadf2b09d1 783b977dc2
commit 7ee6711125
9 changed files with 1660 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/electron/binary/generic.nix
+3
View File
@@ -187,6 +187,9 @@ let
'';
passthru.dist = finalAttrs.finalPackage + "/libexec/electron";
__structuredAttrs = true;
strictDeps = true;
};
darwin = finalAttrs: {
pkgs/development/tools/electron/binary/info.json
+32 -21
View File
@@ -12,35 +12,46 @@
},
"39": {
"hashes": {
"aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa",
"aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97",
"armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40",
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
"x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d",
"x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33"
"aarch64-darwin": "f7e3ed2cc34dd2eba3f2a95234b576fe8082d35fb133e482102c08105f298572",
"aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247",
"armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc",
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
"x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b",
"x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1"
},
"version": "39.8.9"
"version": "39.8.10"
},
"40": {
"hashes": {
"aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7",
"aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634",
"armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5",
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
"x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0",
"x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8"
"aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5",
"aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63",
"armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681",
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
"x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04",
"x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667"
},
"version": "40.9.2"
"version": "40.10.0"
},
"41": {
"hashes": {
"aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0",
"aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a",
"armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c",
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
"x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737",
"x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2"
"aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a",
"aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a",
"armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875",
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
"x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4",
"x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97"
},
"version": "41.3.0"
"version": "41.6.1"
},
"42": {
"hashes": {
"aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117",
"aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d",
"armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a",
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
"x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f",
"x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9"
},
"version": "42.1.0"
}
}
pkgs/development/tools/electron/chromedriver/generic.nix
+3
View File
@@ -86,6 +86,9 @@ let
install -m777 -D chromedriver $out/bin/chromedriver
runHook postInstall
'';
__structuredAttrs = true;
strictDeps = true;
};
darwin = {
pkgs/development/tools/electron/chromedriver/info.json
+32 -21
View File
@@ -12,35 +12,46 @@
},
"39": {
"hashes": {
"aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf",
"aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3",
"armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6",
"headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
"x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69",
"x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14"
"aarch64-darwin": "c21e261f8047a51c5a2e8d5ad19fc66d9f389c215bd2ada680c3ea39618f3f90",
"aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0",
"armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b",
"headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
"x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c",
"x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33"
},
"version": "39.8.9"
"version": "39.8.10"
},
"40": {
"hashes": {
"aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528",
"aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107",
"armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4",
"headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
"x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a",
"x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432"
"aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0",
"aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc",
"armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73",
"headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18",
"x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8",
"x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f"
},
"version": "40.9.2"
"version": "40.10.0"
},
"41": {
"hashes": {
"aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16",
"aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5",
"armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee",
"headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
"x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9",
"x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f"
"aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0",
"aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885",
"armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0",
"headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb",
"x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7",
"x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c"
},
"version": "41.3.0"
"version": "41.6.1"
},
"42": {
"hashes": {
"aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21",
"aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1",
"armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b",
"headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins",
"x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb",
"x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e"
},
"version": "42.1.0"
}
}
pkgs/development/tools/electron/common.nix
+12 -1
View File
@@ -11,6 +11,7 @@
npmHooks,
yarn-berry_4,
unzip,
writers,
libnotify,
libpulseaudio,
@@ -68,10 +69,20 @@ in
npmRoot = "third_party/node";
missingHashes =
if (info.electron_yarn_data ? "missing_hashes") then
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
else
null;
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
src = gclientDeps."src/electron".path;
patches = [ yarnPatch ];
hash = info.electron_yarn_hash;
hash = info.electron_yarn_data.hash;
missingHashes =
if (info.electron_yarn_data ? "missing_hashes") then
writers.writeJSON "missing-hashes.json" info.electron_yarn_data.missing_hashes
else
null;
};
dontYarnBerryInstallDeps = true; # we'll run the hook manually
pkgs/development/tools/electron/info.json
+1535 -35
View File
File diff suppressed because it is too large Load Diff
pkgs/development/tools/electron/update.py
+32 -6
View File
@@ -113,17 +113,38 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
}
}
@memory.cache
def get_electron_yarn_hash(electron_tag: str) -> str:
def get_electron_yarn_data(electron_tag: str) -> dict:
print(f"yarn-berry-fetcher prefetch", file=sys.stderr)
with tempfile.TemporaryDirectory() as tmp_dir:
print(f"Patching yarn.lock for yarn 4.14 support", file=sys.stderr)
yarn_lock_file=get_electron_file(electron_tag, "yarn.lock")
patched_yarn_lock_file=yarn_lock_file.replace('version: 8', 'version: 9', count=1)
with open(tmp_dir + "/yarn.lock", "w") as f:
f.write(get_electron_file(electron_tag, "yarn.lock"))
return (
subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"])
f.write(patched_yarn_lock_file)
missing_hashes_str = (
subprocess.check_output(
["yarn-berry-fetcher", "missing-hashes", tmp_dir + "/yarn.lock"]
)
.decode("utf-8")
.strip()
)
missing_hashes = json.loads(missing_hashes_str)
cmd = ["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"]
if missing_hashes:
with open(tmp_dir + "/missing-hashes.json", "w") as f:
f.write(missing_hashes_str)
cmd.append(tmp_dir + "/missing-hashes.json")
hash = subprocess.check_output(cmd).decode("utf-8").strip()
data = {
"hash": hash,
}
if missing_hashes:
data["missing_hashes"] = missing_hashes
return data
@memory.cache
def get_chromium_npm_hash(chromium_tag: str) -> str:
@@ -143,7 +164,12 @@ def get_chromium_npm_hash(chromium_tag: str) -> str:
def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]:
tasks = []
a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"])))
a = lambda: (
(
"electron_yarn_data",
get_electron_yarn_data(gclient_data["src/electron"]["args"]["tag"]),
)
)
tasks.append(delayed(a)())
a = lambda: (
(
pkgs/development/tools/electron/wrapper.nix
+4
View File
@@ -40,5 +40,9 @@ stdenv.mkDerivation {
unwrapped = electron-unwrapped;
inherit (electron-unwrapped) headers dist;
};
__structuredAttrs = true;
strictDeps = true;
inherit (electron-unwrapped) meta;
}
pkgs/top-level/all-packages.nix
+7
View File
@@ -5294,6 +5294,7 @@ with pkgs;
electron_39-bin
electron_40-bin
electron_41-bin
electron_42-bin
;
inherit (callPackages ../development/tools/electron/chromedriver { })
@@ -5301,6 +5302,7 @@ with pkgs;
electron-chromedriver_39
electron-chromedriver_40
electron-chromedriver_41
electron-chromedriver_42
;
inherit
@@ -5333,12 +5335,17 @@ with pkgs;
src = electron-source.electron_41;
bin = electron_41-bin;
};
electron_42 = getElectronPkg {
src = electron-source.electron_42;
bin = electron_42-bin;
};
}
)
electron_38
electron_39
electron_40
electron_41
electron_42
;
electron = electron_41;
electron-bin = electron_41-bin;