electron{-source,-bin,-chromedriver}: updates by teutat3s · Pull Request #363541 · NixOS/nixpkgs

teutat3s · 2024-12-09T11:37:53Z

Built on x86_64-linux:

all three -bin variants
electron_33-source
electron_32-source
electron_31-source

Things done

Add a 👍 reaction to pull requests you find important.

- Changelog: https://github.com/electron/electron/releases/tag/v31.7.6 - Diff: electron/electron@refs/tags/v31.7.2...v31.7.6

- Changelog: https://github.com/electron/electron/releases/tag/v32.2.7 - Diff: electron/electron@refs/tags/v32.2.2...v32.2.7

- Changelog: https://github.com/electron/electron/releases/tag/v33.3.0 - Diff: electron/electron@refs/tags/v33.0.2...v33.3.0

- Changelog: https://github.com/electron/electron/releases/tag/v31.7.6 - Diff: electron/electron@refs/tags/v31.7.2...v31.7.6

- Changelog: https://github.com/electron/electron/releases/tag/v32.2.7 - Diff: electron/electron@refs/tags/v32.2.2...v32.2.7

- Changelog: https://github.com/electron/electron/releases/tag/v33.3.0 - Diff: electron/electron@refs/tags/v33.0.2...v33.3.0

emilylange

Thanks :)

I will try to keep an eye on electron and intend to open PRs as well.

nixpkgs-review on x86_64-linux will likely take 6 hours or so on the infra currently delegated to it.

emilylange · 2024-12-09T16:25:44Z

pkgs/development/tools/electron/info.json

                "fetcher": "fetchFromGitiles",
                "hash": "sha256-lepGVhzXrBAY5YWwobe18FroRiOD/Q9f8QqazHDmvTY=",
-                "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
+                "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",


chromium has since #357371 (specifically 8dd2f1a) more or less the same logic to resolve the dependencies.
But instead of having a bunch of rm in postFetch, chromium uses a custom recompress = true flag.

This is currently not available to electron as a consumer of the chromium derivation.
Well and it has its own downsides but oh well.

So nothing actionable so far, just as a fyi :)

nixpkgs/pkgs/applications/networking/browsers/chromium/update.mjs

Lines 93 to 95 in c2a355e

if (value.url === 'https://chromium.googlesource.com/chromium/src.git') {

value.recompress = true

}

nixpkgs/pkgs/applications/networking/browsers/chromium/info.json

Line 24 in 878ced9

"recompress": true

nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix

Lines 154 to 170 in 878ced9

chromiumDeps = lib.mapAttrs (path: args: fetchFromGitiles (removeAttrs args [ "recompress" ] // lib.optionalAttrs args.recompress or false {

name = "source.tar.zstd";

downloadToTemp = false;

passthru.unpack = true;

postFetch = ''

tar \

--use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \

--sort=name \

--mtime="1970-01-01" \

--owner=root --group=root \

--numeric-owner --mode=go=rX,u+rw,a-s \

--remove-files \

--directory="$out" \

-cf "$TMPDIR/source.zstd" .

mv "$TMPDIR/source.zstd" "$out"

'';

})) upstream-info.DEPS;

nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix

Lines 172 to 186 in 878ced9

unpackPhaseSnippet = lib.concatStrings (lib.mapAttrsToList (path: dep:

(if dep.unpack or false

then ''

mkdir -p ${path}

pushd ${path}

unpackFile ${dep}

popd

''

else ''

mkdir -p ${builtins.dirOf path}

cp -r ${dep}/. ${path}

''

) + ''

chmod u+w -R ${path}

'') chromiumDeps);

(spoiler: it's recompressTarball all over again)

emilylange · 2024-12-10T13:30:03Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 363541

`x86_64-linux`

✅ 92 packages built:

affine
antares
antimatter-dimensions
bilibili
bitwarden-desktop
bitwarden-directory-connector
blockbench
bruno
camunda-modeler
caprine
chatd
deltachat-desktop
drawio
drawio-headless
electron
electron-bin
electron-chromedriver
electron-chromedriver_31
electron-chromedriver_32
electron_31
electron_31-bin
electron_32
electron_32-bin
element-desktop
element-desktop-wayland
equibop
fcast-receiver
feishin
follow
freetube
geogebra6
gfn-electron
gitify
goofcord
google-chat-linux
headset
heroic
heroic-unwrapped
httptoolkit
itch
jitsi-meet-electron
kando
koodo-reader
kuro
legcord
mattermost-desktop
morgen
mqtt-explorer
nix-tour
obsidian
open-stage-control
pandoc-drawio-filter
pandoc-drawio-filter.dist
pocket-casts
podman-desktop
pritunl-client
proton-pass
protonmail-desktop
python311Packages.mkdocs-drawio-exporter
python311Packages.mkdocs-drawio-exporter.dist
python312Packages.mkdocs-drawio-exporter
python312Packages.mkdocs-drawio-exporter.dist
r2modman
redisinsight
revolt-desktop
ride
sharedown
sieve-editor-gui
siyuan
standardnotes
stretchly
super-productivity
teams-for-linux
terra-station
tetrio-desktop
thedesk
threema-desktop
uhk-agent
uhk-udev-rules
uivonim
vesktop
vieb
webcord
webcord-vencord
webtorrent_desktop
yandex-music
youtube-music
ytdownloader
ytmdesktop
zap-chip-gui
zepp-simulator
zulip

Manually checked that each electron-source version, element-desktop and bitwarden-desktop starts. Not much but /shrug

Intend to merge this later today, assuming you have no objections :)

nixpkgs-ci · 2024-12-10T23:24:19Z

Successfully created backport PR for release-24.05:

[Backport release-24.05] electron{-source,-bin,-chromedriver}: updates #364060

nixpkgs-ci · 2024-12-10T23:24:33Z

Successfully created backport PR for release-24.11:

[Backport release-24.11] electron{-source,-bin,-chromedriver}: updates #364061

teutat3s added backport release-24.05 labels Dec 9, 2024

teutat3s requested a review from emilylange December 9, 2024 11:38

teutat3s added 9 commits December 9, 2024 12:41

electron_31-bin: 31.7.2 -> 31.7.6

a9f0197

- Changelog: https://github.com/electron/electron/releases/tag/v31.7.6 - Diff: electron/electron@refs/tags/v31.7.2...v31.7.6

electron_32-bin: 32.2.2 -> 32.2.7

ae863e8

- Changelog: https://github.com/electron/electron/releases/tag/v32.2.7 - Diff: electron/electron@refs/tags/v32.2.2...v32.2.7

electron_33-bin: 33.0.2 -> 33.3.0

8b10e86

- Changelog: https://github.com/electron/electron/releases/tag/v33.3.0 - Diff: electron/electron@refs/tags/v33.0.2...v33.3.0

electron-chromedriver_31: 31.7.2 -> 31.7.6

06a1f5b

electron-chromedriver_32: 32.2.2 -> 32.2.7

2f6cfd7

electron-chromedriver_33: 33.0.2 -> 33.3.0

90cb09d

electron-source.electron_31: 31.7.2 -> 31.7.6

ae84674

- Changelog: https://github.com/electron/electron/releases/tag/v31.7.6 - Diff: electron/electron@refs/tags/v31.7.2...v31.7.6

electron-source.electron_32: 32.2.2 -> 32.2.7

0b9542d

- Changelog: https://github.com/electron/electron/releases/tag/v32.2.7 - Diff: electron/electron@refs/tags/v32.2.2...v32.2.7

electron-source.electron_33: 33.0.2 -> 33.3.0

b0873cb

- Changelog: https://github.com/electron/electron/releases/tag/v33.3.0 - Diff: electron/electron@refs/tags/v33.0.2...v33.3.0

teutat3s force-pushed the electron-updates branch from 6bf77ff to b0873cb Compare December 9, 2024 11:41

github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 9, 2024

emilylange added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Dec 9, 2024

teutat3s changed the title ~~electron{-source,_bin,-chromedriver}: updates~~ electron{-source,-bin,-chromedriver}: updates Dec 9, 2024

emilylange reviewed Dec 9, 2024

View reviewed changes

emilylange merged commit ea8474c into NixOS:master Dec 10, 2024

nixpkgs-ci bot mentioned this pull request Dec 10, 2024

[Backport release-24.05] electron{-source,-bin,-chromedriver}: updates #364060

Merged

1 task

nixpkgs-ci bot mentioned this pull request Dec 10, 2024

[Backport release-24.11] electron{-source,-bin,-chromedriver}: updates #364061

Merged

1 task

teutat3s deleted the electron-updates branch December 11, 2024 09:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

electron{-source,-bin,-chromedriver}: updates#363541

electron{-source,-bin,-chromedriver}: updates#363541
emilylange merged 9 commits intoNixOS:masterfrom
teutat3s:electron-updates

teutat3s commented Dec 9, 2024 •

edited

Loading

Uh oh!

emilylange left a comment

Uh oh!

emilylange Dec 9, 2024

Uh oh!

emilylange commented Dec 10, 2024

Uh oh!

nixpkgs-ci bot commented Dec 10, 2024

Uh oh!

nixpkgs-ci bot commented Dec 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	if (value.url === 'https://chromium.googlesource.com/chromium/src.git') {
	value.recompress = true
	}

	chromiumDeps = lib.mapAttrs (path: args: fetchFromGitiles (removeAttrs args [ "recompress" ] // lib.optionalAttrs args.recompress or false {
	name = "source.tar.zstd";
	downloadToTemp = false;
	passthru.unpack = true;
	postFetch = ''
	tar \
	--use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \
	--sort=name \
	--mtime="1970-01-01" \
	--owner=root --group=root \
	--numeric-owner --mode=go=rX,u+rw,a-s \
	--remove-files \
	--directory="$out" \
	-cf "$TMPDIR/source.zstd" .
	mv "$TMPDIR/source.zstd" "$out"
	'';
	})) upstream-info.DEPS;

	unpackPhaseSnippet = lib.concatStrings (lib.mapAttrsToList (path: dep:
	(if dep.unpack or false
	then ''
	mkdir -p ${path}
	pushd ${path}
	unpackFile ${dep}
	popd
	''
	else ''
	mkdir -p ${builtins.dirOf path}
	cp -r ${dep}/. ${path}
	''
	) + ''
	chmod u+w -R ${path}
	'') chromiumDeps);

Uh oh!

Conversation

teutat3s commented Dec 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

emilylange left a comment

Choose a reason for hiding this comment

Uh oh!

emilylange Dec 9, 2024

Choose a reason for hiding this comment

Uh oh!

emilylange commented Dec 10, 2024

nixpkgs-review result

x86_64-linux

Uh oh!

nixpkgs-ci bot commented Dec 10, 2024

Uh oh!

nixpkgs-ci bot commented Dec 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

teutat3s commented Dec 9, 2024 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`