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

electron: distinguish between revs and tags

Browse Source
This commit is contained in:
Yureka
2025-05-14 22:15:26 +02:00
committed by Yureka
parent cb8484366b
commit 65540e5447
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/electron/common.nix
+2 -2
View File
@@ -113,14 +113,14 @@ in
echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni
echo 'generate_location_tags = true' >> build/config/gclient_args.gni
echo 'LASTCHANGE=${info.deps."src".args.rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE
echo 'LASTCHANGE=${info.deps."src".args.tag}-refs/heads/master@{#0}' > build/util/LASTCHANGE
echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime
cat << EOF > gpu/config/gpu_lists_version.h
/* Generated by lastchange.py, do not edit.*/
#ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
#define GPU_CONFIG_GPU_LISTS_VERSION_H_
#define GPU_LISTS_VERSION "${info.deps."src".args.rev}"
#define GPU_LISTS_VERSION "${info.deps."src".args.tag}"
#endif // GPU_CONFIG_GPU_LISTS_VERSION_H_
EOF
pkgs/development/tools/electron/info.json
+9 -9
View File
@@ -18,7 +18,7 @@
"args": {
"hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"rev": "132.0.6834.210",
"tag": "132.0.6834.210",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@@ -60,7 +60,7 @@
"hash": "sha256-NdeVWtmGpBqUuRtPBc0xLn7z4YNZ9p765a9nM3XdjCw=",
"owner": "electron",
"repo": "electron",
"rev": "v34.5.5"
"tag": "v34.5.5"
},
"fetcher": "fetchFromGitHub"
},
@@ -397,7 +397,7 @@
"hash": "sha256-vc3Ztw8m0P96QoCjtyu2Nb0TpVMu9ifrVlkJY15aVbE=",
"owner": "nodejs",
"repo": "node",
"rev": "v20.19.1"
"tag": "v20.19.1"
},
"fetcher": "fetchFromGitHub"
},
@@ -1295,7 +1295,7 @@
"args": {
"hash": "sha256-LL0lmb23zTjOwi8Sbz0Vb3Nj3ptqpRL/5V5rI8vXu0U=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"rev": "134.0.6998.205",
"tag": "134.0.6998.205",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@@ -1337,7 +1337,7 @@
"hash": "sha256-rRrXXuCfS9X+00u7/18A3m8V+k9MK0QITuheQlHFZdQ=",
"owner": "electron",
"repo": "electron",
"rev": "v35.3.0"
"tag": "v35.3.0"
},
"fetcher": "fetchFromGitHub"
},
@@ -1666,7 +1666,7 @@
"hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=",
"owner": "nodejs",
"repo": "node",
"rev": "v22.14.0"
"tag": "v22.14.0"
},
"fetcher": "fetchFromGitHub"
},
@@ -2604,7 +2604,7 @@
"args": {
"hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"rev": "136.0.7103.49",
"tag": "136.0.7103.49",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@@ -2646,7 +2646,7 @@
"hash": "sha256-mErVGqPBvplWEEOnEFnEdxDU34jc5YECLj18rU7E/XM=",
"owner": "electron",
"repo": "electron",
"rev": "v36.2.0"
"tag": "v36.2.0"
},
"fetcher": "fetchFromGitHub"
},
@@ -2975,7 +2975,7 @@
"hash": "sha256-KXhkO1qKbf7/KktyLQcPGEzcIErsIKAUE89oGTP2mbI=",
"owner": "nodejs",
"repo": "node",
"rev": "v22.15.0"
"tag": "v22.15.0"
},
"fetcher": "fetchFromGitHub"
},
pkgs/development/tools/electron/update.py
+13 -13
View File
@@ -60,18 +60,18 @@ def get_gclient_data(rev: str) -> any:
return json.loads(output)
def get_chromium_file(chromium_rev: str, filepath: str) -> str:
def get_chromium_file(chromium_tag: str, filepath: str) -> str:
return base64.b64decode(
urlopen(
f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_rev}/{filepath}?format=TEXT"
f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_tag}/{filepath}?format=TEXT"
).read()
).decode("utf-8")
def get_electron_file(electron_rev: str, filepath: str) -> str:
def get_electron_file(electron_tag: str, filepath: str) -> str:
return (
urlopen(
f"https://raw.githubusercontent.com/electron/electron/{electron_rev}/{filepath}"
f"https://raw.githubusercontent.com/electron/electron/{electron_tag}/{filepath}"
)
.read()
.decode("utf-8")
@@ -79,9 +79,9 @@ def get_electron_file(electron_rev: str, filepath: str) -> str:
@memory.cache
def get_chromium_gn_source(chromium_rev: str) -> dict:
def get_chromium_gn_source(chromium_tag: str) -> dict:
gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'"
gn_commit = re.search(gn_pattern, get_chromium_file(chromium_rev, "DEPS")).group(1)
gn_commit = re.search(gn_pattern, get_chromium_file(chromium_tag, "DEPS")).group(1)
gn_prefetch: bytes = subprocess.check_output(
[
"nix-prefetch-git",
@@ -102,11 +102,11 @@ def get_chromium_gn_source(chromium_rev: str) -> dict:
}
@memory.cache
def get_electron_yarn_hash(electron_rev: str) -> str:
def get_electron_yarn_hash(electron_tag: str) -> str:
print(f"prefetch-yarn-deps", file=sys.stderr)
with tempfile.TemporaryDirectory() as tmp_dir:
with open(tmp_dir + "/yarn.lock", "w") as f:
f.write(get_electron_file(electron_rev, "yarn.lock"))
f.write(get_electron_file(electron_tag, "yarn.lock"))
return (
subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
.decode("utf-8")
@@ -114,11 +114,11 @@ def get_electron_yarn_hash(electron_rev: str) -> str:
)
@memory.cache
def get_chromium_npm_hash(chromium_rev: str) -> str:
def get_chromium_npm_hash(chromium_tag: str) -> str:
print(f"prefetch-npm-deps", file=sys.stderr)
with tempfile.TemporaryDirectory() as tmp_dir:
with open(tmp_dir + "/package-lock.json", "w") as f:
f.write(get_chromium_file(chromium_rev, "third_party/node/package-lock.json"))
f.write(get_chromium_file(chromium_tag, "third_party/node/package-lock.json"))
return (
subprocess.check_output(
["prefetch-npm-deps", tmp_dir + "/package-lock.json"]
@@ -131,12 +131,12 @@ def get_chromium_npm_hash(chromium_rev: 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"]["rev"])))
a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["tag"])))
tasks.append(delayed(a)())
a = lambda: (
(
"chromium_npm_hash",
get_chromium_npm_hash(gclient_data["src"]["args"]["rev"]),
get_chromium_npm_hash(gclient_data["src"]["args"]["tag"]),
)
)
tasks.append(delayed(a)())
@@ -155,7 +155,7 @@ def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict
**{key: m[key] for key in ["version", "modules", "chrome", "node"]},
"chromium": {
"version": m["chrome"],
"deps": get_chromium_gn_source(gclient_data["src"]["args"]["rev"]),
"deps": get_chromium_gn_source(gclient_data["src"]["args"]["tag"]),
},
**task_results,
},