mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
electron-source.electron_{37,38,39}: updates, use yarn-berry
(cherry picked from commit 707e8a2736)
This commit is contained in:
TomaSajt
committed by
github-actions[bot]
github-actions[bot]
parent
bf7f7d7519
commit
b8535f2a93
@@ -2,31 +2,34 @@
|
||||
lib,
|
||||
stdenv,
|
||||
chromium,
|
||||
nodejs,
|
||||
fetchYarnDeps,
|
||||
fetchNpmDeps,
|
||||
fetchpatch,
|
||||
fixup-yarn-lock,
|
||||
npmHooks,
|
||||
yarn,
|
||||
libnotify,
|
||||
unzip,
|
||||
|
||||
pkgsBuildHost,
|
||||
pipewire,
|
||||
libsecret,
|
||||
libpulseaudio,
|
||||
speechd-minimal,
|
||||
info,
|
||||
gclient2nix,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
yarn-berry_4,
|
||||
unzip,
|
||||
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
libsecret,
|
||||
pipewire,
|
||||
speechd-minimal,
|
||||
|
||||
info,
|
||||
}:
|
||||
|
||||
let
|
||||
gclientDeps = gclient2nix.importGclientDeps info.deps;
|
||||
yarn-berry = yarn-berry_4;
|
||||
in
|
||||
|
||||
((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
||||
packageName = "electron";
|
||||
inherit (info) version;
|
||||
|
||||
buildTargets = [
|
||||
"electron:copy_node_headers"
|
||||
"electron:electron_dist_zip"
|
||||
@@ -41,19 +44,16 @@ in
|
||||
moveToDev = false;
|
||||
|
||||
nativeBuildInputs = base.nativeBuildInputs ++ [
|
||||
nodejs
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
unzip
|
||||
npmHooks.npmConfigHook
|
||||
gclient2nix.gclientUnpackHook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
yarn-berry
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = base.buildInputs ++ [ libnotify ];
|
||||
|
||||
electronOfflineCache = fetchYarnDeps {
|
||||
yarnLock = gclientDeps."src/electron".path + "/yarn.lock";
|
||||
sha256 = info.electron_yarn_hash;
|
||||
};
|
||||
npmDeps = fetchNpmDeps rec {
|
||||
src = gclientDeps."src".path;
|
||||
# Assume that the fetcher always unpack the source,
|
||||
@@ -61,6 +61,16 @@ in
|
||||
sourceRoot = "${src.name}/third_party/node";
|
||||
hash = info.chromium_npm_hash;
|
||||
};
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
src = gclientDeps."src/electron".path;
|
||||
hash = info.electron_yarn_hash;
|
||||
};
|
||||
|
||||
dontYarnBerryInstallDeps = true; # we'll run the hook manually
|
||||
|
||||
inherit gclientDeps;
|
||||
unpackPhase = null; # prevent chromium's unpackPhase from being used
|
||||
sourceRoot = "src";
|
||||
@@ -136,8 +146,6 @@ in
|
||||
})
|
||||
];
|
||||
|
||||
npmRoot = "third_party/node";
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p third_party/jdk/current/bin
|
||||
|
||||
@@ -186,15 +194,10 @@ in
|
||||
EOF
|
||||
''
|
||||
+ ''
|
||||
|
||||
(
|
||||
cd electron
|
||||
export HOME=$TMPDIR/fake_home
|
||||
yarn config --offline set yarn-offline-mirror $electronOfflineCache
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
YARN_ENABLE_SCRIPTS=0 yarnBerryConfigHook
|
||||
)
|
||||
|
||||
(
|
||||
cd ..
|
||||
PATH=$PATH:${
|
||||
|
||||
@@ -56,10 +56,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-I8C0lT1VnNP4fSMp5LReFe8tQj/3IM1Ko6SohY187Cc=",
|
||||
"hash": "sha256-ssEFUO6UFZI5/a49oPbYXMhYCyHnE+HGK8H26jKN5JE=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v37.10.2"
|
||||
"tag": "v37.10.3"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1326,10 +1326,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
|
||||
"electron_yarn_hash": "sha256-ouaxVsLQ+IapxTJxM7KFuLq9PSsMRhPwrWYT/opxE0I=",
|
||||
"modules": "136",
|
||||
"node": "22.21.1",
|
||||
"version": "37.10.2"
|
||||
"version": "37.10.3"
|
||||
},
|
||||
"38": {
|
||||
"chrome": "140.0.7339.249",
|
||||
@@ -1388,10 +1388,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-1C17jQP8TFxBTHhIz+fHB83OFOykzZToPOrwzl+NN9Q=",
|
||||
"hash": "sha256-gSW1dI2PBGaLleuekWEI8Om/HE+V7w7QPy3wWxfN0V0=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v38.7.1"
|
||||
"tag": "v38.7.2"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2650,13 +2650,13 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
|
||||
"electron_yarn_hash": "sha256-R5AHeNFOeH7ZXipzM9u08KG5zJhkDDTW4kGt3BYYN64=",
|
||||
"modules": "139",
|
||||
"node": "22.21.1",
|
||||
"version": "38.7.1"
|
||||
"version": "38.7.2"
|
||||
},
|
||||
"39": {
|
||||
"chrome": "142.0.7444.175",
|
||||
"chrome": "142.0.7444.265",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@@ -2665,15 +2665,15 @@
|
||||
"version": "0-unstable-2025-09-18"
|
||||
}
|
||||
},
|
||||
"version": "142.0.7444.175"
|
||||
"version": "142.0.7444.265"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-nRZWCvoGYS4gxoJidkKGqTMGUuFfXfhIrHc3j/xRlaI=",
|
||||
"hash": "sha256-VJKx61JTIGg4j/kNqtOWkYOsy0xYYZbuyoiKFVcbZgc=",
|
||||
"postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "142.0.7444.175",
|
||||
"tag": "142.0.7444.265",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -2712,10 +2712,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-Zvu8Puh7j/u84cigKtfhOjBcxIYKJAv1mmbmIFRwdNY=",
|
||||
"hash": "sha256-udrEpPg2LDThZDTXJ1jpkIEiDwlD7lRUJsV6HSwN0i8=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v39.2.3"
|
||||
"tag": "v39.3.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2745,8 +2745,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"args": {
|
||||
"hash": "sha256-PM7msE9678QFyr7qp47Bc0vTntsSCeB/cirg9ME6TZk=",
|
||||
"rev": "7b27cb13556246035dfc7b308702b1b20710df47",
|
||||
"hash": "sha256-CCjQue8xv/t81I3ncqS6Ib3hjcs+FKCB+yvNUE+A+Dc=",
|
||||
"rev": "7628a2726022fc768f2464ed5060bbc97e13f77a",
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3009,8 +3009,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"args": {
|
||||
"hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=",
|
||||
"rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
|
||||
"hash": "sha256-4SIqiDQtelkjdzTSDfB5GCymh+24MoiN77NNCxTV6qU=",
|
||||
"rev": "747b0d1aebe33e5fc3d32677eb88315ab000eb5e",
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -3991,16 +3991,16 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-jECAfgeAgdkhbI/8BgT9TakR9Ylha2zPznjZzibPQbE=",
|
||||
"rev": "baea8d627b70725fb777ebc1074f8ec4110ef6cb",
|
||||
"hash": "sha256-FNEyH9sT59A0SFRloRMbK1YOy/slwtAz2/+T4mlCdWs=",
|
||||
"rev": "8fa4e7c7469cd4d321e2241b86f684d52197a615",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f",
|
||||
"electron_yarn_hash": "sha256-veyZGCQJO23iQk4gmFo5oLASxamiYm4tAQSUS12IGxg=",
|
||||
"modules": "140",
|
||||
"node": "22.21.1",
|
||||
"version": "39.2.3"
|
||||
"version": "39.3.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-yarn-deps prefetch-npm-deps gclient2nix
|
||||
#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nurl prefetch-npm-deps yarn-berry_4.yarn-berry-fetcher nix-prefetch-git gclient2nix
|
||||
"""
|
||||
electron updater
|
||||
|
||||
@@ -115,12 +115,12 @@ def get_chromium_gn_source(chromium_tag: str) -> dict:
|
||||
|
||||
@memory.cache
|
||||
def get_electron_yarn_hash(electron_tag: str) -> str:
|
||||
print(f"prefetch-yarn-deps", file=sys.stderr)
|
||||
print(f"yarn-berry-fetcher prefetch", file=sys.stderr)
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
with open(tmp_dir + "/yarn.lock", "w") as f:
|
||||
f.write(get_electron_file(electron_tag, "yarn.lock"))
|
||||
return (
|
||||
subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
|
||||
subprocess.check_output(["yarn-berry-fetcher", "prefetch", tmp_dir + "/yarn.lock"])
|
||||
.decode("utf-8")
|
||||
.strip()
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user