Skip to content

[24.11] electron{-source,-bin,-chromedriver}: updates, electron-{bin,source,chromedriver}_36: init at 36.1.0#406425

Merged
TomaSajt merged 14 commits intoNixOS:release-24.11from
teutat3s:backport-405337-to-release-24.11
May 14, 2025
Merged

[24.11] electron{-source,-bin,-chromedriver}: updates, electron-{bin,source,chromedriver}_36: init at 36.1.0#406425
TomaSajt merged 14 commits intoNixOS:release-24.11from
teutat3s:backport-405337-to-release-24.11

Conversation

@teutat3s
Copy link
Member

@teutat3s teutat3s commented May 12, 2025 •
edited
Loading

Manual backports of #403291 and #405337

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

teutat3s added 12 commits May 12, 2025 13:10
@teutat3s
electron_36-bin: init at 36.1.0
8e26247 
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.1
- Changelog: https://github.com/electron/electron/releases/tag/v36.1.0

(cherry picked from commit b880fdd)
@teutat3s
electron-chromedriver_36: init at 36.1.0
88694da 
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.1
- Changelog: https://github.com/electron/electron/releases/tag/v36.1.0

(cherry picked from commit 20401cb)
@teutat3s
electron-source.electron_36: init at 36.1.0
9ac9fe1 
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.0
- Changelog: https://github.com/electron/electron/releases/tag/v36.0.1
- Changelog: https://github.com/electron/electron/releases/tag/v36.1.0

(cherry picked from commit 8d92119)
@teutat3s
electron-source.electron_34: 34.5.3 -> 34.5.5
ef13a4a 
- Changelog: https://github.com/electron/electron/releases/tag/v34.5.5
- Diff: electron/electron@refs/tags/v34.5.3...v34.5.5

(cherry picked from commit e770d93)
@teutat3s
electron-source.electron_35: 35.2.1 -> 35.3.0
c66cea4 
- Changelog: https://github.com/electron/electron/releases/tag/v35.3.0
- Diff: electron/electron@refs/tags/v35.2.1...v35.3.0

(cherry picked from commit c6c6ce6)
@teutat3s
electron-source.electron_36: 36.1.0 -> 36.2.0
a71d6e5 
- Changelog: https://github.com/electron/electron/releases/tag/v36.2.0
- Diff: electron/electron@refs/tags/v36.1.0...v36.2.0

(cherry picked from commit 39926be)
@teutat3s
electron_34-bin: 34.5.3 -> 34.5.5
ab2e8df 
- Changelog: https://github.com/electron/electron/releases/tag/v34.5.5
- Diff: electron/electron@refs/tags/v34.5.3...v34.5.5

(cherry picked from commit 5f95132)
@teutat3s
electron-chromedriver_34: 34.5.3 -> 34.5.5
7ab4a82 
- Changelog: https://github.com/electron/electron/releases/tag/v34.5.5
- Diff: electron/electron@refs/tags/v34.5.3...v34.5.5

(cherry picked from commit b913c75)
@teutat3s
electron_35-bin: 35.2.1 -> 35.3.0
3e0e555 
- Changelog: https://github.com/electron/electron/releases/tag/v35.3.0
- Diff: electron/electron@refs/tags/v35.2.1...v35.3.0

(cherry picked from commit 4f5c81b)
@teutat3s
electron-chromedriver_35: 35.2.1 -> 35.3.0
24a6ccd 
- Changelog: https://github.com/electron/electron/releases/tag/v35.3.0
- Diff: electron/electron@refs/tags/v35.2.1...v35.3.0

(cherry picked from commit c6b4255)
@teutat3s
electron_36-bin: 36.1.0 -> 36.2.0
f41b8eb 
- Changelog: https://github.com/electron/electron/releases/tag/v36.2.0
- Diff: electron/electron@refs/tags/v36.1.0...v36.2.0

(cherry picked from commit 5fe363a)
@teutat3s
electron-chromedriver_36: 36.1.0 -> 36.2.0
51f7f21 
- Changelog: https://github.com/electron/electron/releases/tag/v36.2.0
- Diff: electron/electron@refs/tags/v36.1.0...v36.2.0

(cherry picked from commit 496fcd4)
@github-actions github-actions bot added the 4.workflow: backport This targets a stable branch label May 12, 2025
@yuyuyureka
Copy link
Contributor

yuyuyureka commented May 12, 2025

Building electron_{34,35,36} on aarch64-linux

@github-actions 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 May 12, 2025
@yuyuyureka
Copy link
Contributor

yuyuyureka commented May 12, 2025

Built electron_{34,35,36} on aarch64-linux ✔️

@TomaSajt
Copy link
Contributor

TomaSajt commented May 12, 2025

Seems like the hashes of electron-bin_{33,34,35,36}.headers are incorrect, even before this PR.

Are you copying the hashes from the master branch PRs? Because that's not the same...
(master has nix-prefetch-url --unpack $url but release-24.11 has nix-prefetch-url $url)

Seems like we missed this issue because it's not part of the build closure.
Well, not like anyone's really using .headers in this branch.

@TomaSajt
Copy link
Contributor

TomaSajt commented May 12, 2025 •
edited
Loading

I'd regenerate the hashes by doing:

for v in 33 34 35 36; do  pkgs/development/tools/electron/binary/update.py update --version $v; done

(this also regenerates 33, which update-all wouldn't update)

@TomaSajt
Copy link
Contributor

TomaSajt commented May 12, 2025 

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 0b88d94b3725..abc9aa6f0819 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -81,7 +81,7 @@
             "aarch64-darwin": "9c763751c280b20ec93cecdc7f369bed876fc6728863a9ba5d7435096401f048",
             "aarch64-linux": "e865132767e0930f5fef8ee146b9dd83c7f8fb95ed533c4de99e7057d5de5b61",
             "armv7l-linux": "c7bc11f757cb123ce7647af593d09b60ddc87338b47c7053c2719522ddc6515c",
-            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
+            "headers": "0wi3iqsyvhfhhf1l1z1i60nyic380y4jralj15qnxazbhpggmjcs",
             "x86_64-darwin": "67f3b851e7583309e7bbe3e3e819b1e1c6033ab57207d838bc4ed4982ccef456",
             "x86_64-linux": "212d431c7c916292311c797cd91f84467c5abd6e6983cf24b162efff64cee8a9"
         },
@@ -92,7 +92,7 @@
             "aarch64-darwin": "3e2fd510e2c3703862bfb3114f4aa167504ef97130cfc06d538764b8c8b7211e",
             "aarch64-linux": "05a5e7601672a8bca016fb6e1fe67afc39d54a5e6ab469eff3d5cbbce3a43557",
             "armv7l-linux": "c5aa5f77ba3386f2989e330858e6a41b7293b3e741abc4146cf19b5a08b34473",
-            "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
+            "headers": "0bh7i9sfvkb5sr5kfb18aznnkiix6rkvfqy90a1rhw12n9dm0q7m",
             "x86_64-darwin": "c1d30282cbc12cd47f6bfddf18a97a71964ee1c6933ceb91292547a45c7baee0",
             "x86_64-linux": "a557db3c99b30a0712849fc9b6b96b56d5a62e51f1d8ace29df4902dc6edea01"
         },
@@ -103,7 +103,7 @@
             "aarch64-darwin": "a01c6589909768dced83f5f5b1cb2f85906ace17fae8e9aab4b900db6268e0e5",
             "aarch64-linux": "e6dc44d0a89e344de8751d4b8f6f3b4ce558fd4d18c0744894a8108a70a8d593",
             "armv7l-linux": "26980b8f10f913b976fa0caf3faa06f5c55956801a2c5a6fb61ac403d82c07fc",
-            "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
+            "headers": "0z8lzgjbbiaap9qwiyz6xpa42vfjdrwa5a27r5wyy2p8qsprv6xa",
             "x86_64-darwin": "06426674106607c73b858ba6d69446cd0c56f40bbcb3ec35de36a516da11833b",
             "x86_64-linux": "d76cef792b8a8a05e707337b3ebc8a44b2c6dd98c2a9ee7a53112633308f7817"
         },
@@ -114,7 +114,7 @@
             "aarch64-darwin": "58da93c88626005c419906e15d4ae0a38f876453b4146fa357ec1545aeff46ae",
             "aarch64-linux": "34705bb8645a64e33861cca51693afd02b5f74e9bbb3a9e6be76fec9ffed3328",
             "armv7l-linux": "7d7c2a4fced66e3f1373810b66b2185f4bc9e27aa0d1ea910c52397b63c2e4d5",
-            "headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
+            "headers": "17yhy512a67nzai895bh2dnnj1kbwh4316agg3lnmmbllsb1n466",
             "x86_64-darwin": "c33a52795bfd51d8801594f4f1a3b17b34571edc8842e30b986b1aa27c3a82d0",
             "x86_64-linux": "013dface80733221d4153aaf538e8969b93f50d68798d7de2425d5e758e6956b"
         },
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index a9ba134594d6..b19d98aee7b5 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -48,7 +48,7 @@
             "aarch64-darwin": "8cccbac5a1922f47bff65734ea05cf4a5a96938bc6696c2bdb8d8ce4b9f4a3eb",
             "aarch64-linux": "edbe9af31a18cef622386ba95cffd4f0d61fff386313297d204c06fad798134e",
             "armv7l-linux": "da1077bf00682a01b02fa580e51f4df681016be0d58e981094463b818561c213",
-            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
+            "headers": "0wi3iqsyvhfhhf1l1z1i60nyic380y4jralj15qnxazbhpggmjcs",
             "x86_64-darwin": "9056e5f4e7d7e6b99e22f4739668cf8425d44c21431b7218bda1720ee207593a",
             "x86_64-linux": "acbebfaa77f32ff1c524f0f326f5f36cf35a3875d8a81f22c3b5c4664e34f7c7"
         },
@@ -59,7 +59,7 @@
             "aarch64-darwin": "36f00fa118aeb349961983e4c4866e0f20096f5cf4ac647f036777b411c7e220",
             "aarch64-linux": "6358fc8a91d625397cde14bfdae32b0eb57a3b079b3ecf355017eaa18badadf9",
             "armv7l-linux": "ca654e2cebf1b2ed1448932862e64325d361be445f9763e4d38e2e4dfa67318e",
-            "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
+            "headers": "0bh7i9sfvkb5sr5kfb18aznnkiix6rkvfqy90a1rhw12n9dm0q7m",
             "x86_64-darwin": "7b4cb534ec96b26a94ad710de288148c984de43453cb43ff2c8f75fbf0f14d19",
             "x86_64-linux": "ff1759b9b7acd79b90bcc5d070be52df67e57950f767b15bf051b104b963e0a4"
         },
@@ -70,7 +70,7 @@
             "aarch64-darwin": "cab8392356a0eecea3cc0ce0484ec721ed55e5343aeda4e4bab43bf874eca03f",
             "aarch64-linux": "bd73195f28a134b48c6872d4fd2b02cbf556ce6b9542c2eb0db24a1973947711",
             "armv7l-linux": "d757d538247f3225d0334eeb0f707fcd3fb483ed920be7d17ada7a27ade7068b",
-            "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
+            "headers": "0z8lzgjbbiaap9qwiyz6xpa42vfjdrwa5a27r5wyy2p8qsprv6xa",
             "x86_64-darwin": "1ef4c2712558300fe12c279199275d9fb911b790abcada98d85fcb41db4fa98a",
             "x86_64-linux": "4a82a0322279e98de71ae7599dd1d152b16a69e794e54a4a17f5d1cdd2aaa9ea"
         },
@@ -81,7 +81,7 @@
             "aarch64-darwin": "fd60bfe2f014e90faf071321568089e0907fb0077d29f3bb9341b059af8a634f",
             "aarch64-linux": "1ad1ce228687516ab70d858ab90067234c6a3b2a607b81bc130ddd5ab5576f41",
             "armv7l-linux": "03af68d98a2257b05f3ae0c02ded4018fc3cd142523cbe30fd7560e740b0370c",
-            "headers": "1rn0p8yf1dm43czl4wn0fsxf4gr4y5pqh08invjgvj8671xsn06d",
+            "headers": "17yhy512a67nzai895bh2dnnj1kbwh4316agg3lnmmbllsb1n466",
             "x86_64-darwin": "ce5116a70e68daeacfd1511b332ac694520b8a4a63ca738353c7e610420d75dc",
             "x86_64-linux": "7851aa60540fd72aa309a649317966f0bc193547ca942b706b78df36c48ff51b"
         },

for the record, here are the hashes

@teutat3s
Copy link
Member Author

teutat3s commented May 12, 2025

@TomaSajt thanks, good catch. Fixed.

TomaSajt
TomaSajt approved these changes May 12, 2025
View reviewed changes
Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@teutat3s teutat3s added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels May 12, 2025
@teutat3s teutat3s mentioned this pull request May 14, 2025
Merged
13 tasks
@TomaSajt TomaSajt merged commit 2589c81 into NixOS:release-24.11 May 14, 2025
26 checks passed
@teutat3s teutat3s deleted the backport-405337-to-release-24.11 branch May 14, 2025 21:32
@teutat3s teutat3s mentioned this pull request May 15, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TomaSajt TomaSajt TomaSajt approved these changes

@yayayayaka yayayayaka Awaiting requested review from yayayayaka

@yuyuyureka yuyuyureka Awaiting requested review from yuyuyureka

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@teutat3s @yuyuyureka @TomaSajt