[25.05] electron-source.electron_36: remove, electron_36-bin: mark as insecure#461995
Merged
yayayayaka merged 2 commits intoNixOS:release-25.05from Dec 2, 2025
Merged
Conversation
teutat3s
changed the title
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between 31f14b1 and original 4a78192 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
electron-source.electron_36: remove
- ## pkgs/development/tools/electron/common.nix ##
-@@ pkgs/development/tools/electron/common.nix: in
- unpackPhase = null; # prevent chromium's unpackPhase from being used
- sourceRoot = "src";
-
-- env =
-- base.env
-- // {
-- # Hydra can fail to build electron due to clang spamming deprecation
-- # warnings mid-build, causing the build log to grow beyond the limit
-- # of 64mb and then getting killed by Hydra.
-- # For some reason, the log size limit appears to only be enforced on
-- # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
-- # unbreak the build on h.n.o, we simply disable those warnings for now.
-- # https://hydra.nixos.org/build/283952243
-- NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
-- }
-- // lib.optionalAttrs (lib.versionAtLeast info.version "35") {
-- # Needed for header generation in electron 35 and above
-- ELECTRON_OUT_DIR = "Release";
-- };
-+ env = base.env // {
-+ # Hydra can fail to build electron due to clang spamming deprecation
-+ # warnings mid-build, causing the build log to grow beyond the limit
-+ # of 64mb and then getting killed by Hydra.
-+ # For some reason, the log size limit appears to only be enforced on
-+ # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
-+ # unbreak the build on h.n.o, we simply disable those warnings for now.
-+ # https://hydra.nixos.org/build/283952243
-+ NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
-+ # Needed for header generation in electron 35 and above
-+ ELECTRON_OUT_DIR = "Release";
-+ };
-
- src = null;
-
- patches =
- base.patches
-- # Fix building with Rust 1.87+
-- # https://issues.chromium.org/issues/407024458
-- ++ lib.optionals (lib.versionOlder info.version "37") [
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6432410
-- # Not using fetchpatch here because it ignores file renames: https://github.com/nixos/nixpkgs/issues/32084
-- ./Reland-Use-global_allocator-to-provide-Rust-allocator-implementation.patch
--
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6434355
-- (fetchpatch {
-- name = "Call-Rust-default-allocator-directly-from-Rust.patch";
-- url = "https://github.com/chromium/chromium/commit/73eef8797a8138f5c26f52a1372644b20613f5ee.patch";
-- hash = "sha256-IcSjPv21xT+l9BwJuzeW2AfwBdKI0dQb3nskk6yeKHU=";
-- })
--
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6439711
-- (fetchpatch {
-- name = "Roll-rust.patch";
-- url = "https://github.com/chromium/chromium/commit/a6c30520486be844735dc646cd5b9b434afa0c6b.patch";
-- includes = [ "build/rust/allocator/*" ];
-- hash = "sha256-MFdR75oSAdFW6telEZt/s0qdUvq/BiYFEHW0vk+RgDk=";
-- })
--
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6456604
-- (fetchpatch {
-- name = "Drop-remap_alloc-dep.patch";
-- url = "https://github.com/chromium/chromium/commit/87d5ad2f621e0d5c81849dde24f3a5347efcb167.patch";
-- hash = "sha256-bEoR6jxEyw6Fzm4Zv4US54Cxa0li/0UTZTU2WUf0Rgo=";
-- })
--
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6454872
-- (fetchpatch {
-- name = "rust-Clean-up-build-rust-allocator-after-a-Rust-tool.patch";
-- url = "https://github.com/chromium/chromium/commit/5c74fcf6fd14491f33dd820022a9ca045f492f68.patch";
-- hash = "sha256-vcD0Zfo4Io/FVpupWOdgurFEqwFCv+oDOtSmHbm+ons=";
-- })
-- ]
-- # Fix building with gperf 3.2+
-- # https://issues.chromium.org/issues/40209959
-- ++ lib.optionals (lib.versionOlder info.version "37") [
-- # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-- (fetchpatch {
-- name = "Dont-apply-FALLTHROUGH-edit-to-gperf-3-2-output.patch";
-- url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch";
-- hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA=";
-- })
-- ]
- # Fix build with Rust 1.89.0
- ++ lib.optionals (lib.versionOlder info.version "38") [
- # https://chromium-review.googlesource.com/c/chromium/src/+/6624733
-@@ pkgs/development/tools/electron/common.nix: in
- done
- done
- )
-- ''
-- + lib.optionalString (lib.versionAtLeast info.version "36") ''
- echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
- echo 'checkout_mutter = false' >> build/config/gclient_args.gni
- ''
+ (cherry picked from commit 4a781922b3a1231c49203a92470410030837e0a3)
## pkgs/development/tools/electron/info.json ##
@@
@@ pkgs/development/tools/electron/info.json
## pkgs/top-level/all-packages.nix ##
@@ pkgs/top-level/all-packages.nix: with pkgs;
- ;
-
+ electron_33 = electron_33-bin;
+ electron_34 = electron_34-bin;
electron_35 = electron_35-bin;
- electron_36 =
- if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_36 then
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
nixpkgs-ci
bot
added
10.rebuild-linux: 11-100
13 tasks
13 tasks
13 tasks
13 tasks
Member
|
Do you plan to backport electron_39 to stable as well? Asking for #462578. |
Member
Author
13 tasks
13 tasks
13 tasks
Member
Author
|
This PR is now open for 7+ days, and today |
This was referenced Nov 24, 2025
yayayayaka
reviewed
Nov 25, 2025
Member
yayayayaka
left a comment
yayayayaka
left a comment
There was a problem hiding this comment.
I'll review the remaining open PRs and then would be up to hit merge.
Member
|
We are a bit behind schedule, so I am going to merge this now. |
Merged
via the queue into
NixOS:release-25.05
with commit Dec 2, 2025
9c5dd13
49 of 50 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Manual backport of #458485.
Packages still using
electron_36(and will be transitively insecure when this PR is merged):Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.