Backport 431468 to release 25.05#432382
Closed
corngood wants to merge 6494 commits intoNixOS:masterfrom
Closed
Conversation
prevent the bot from sending PRs where the only upstream change is a flake.lock update (cherry picked from commit 3ebec4d)
Diff: NixOS/hydra@ed500ca...b812bb5 (cherry picked from commit cc255e5)
(cherry picked from commit 8900b9d)
https://developer.chrome.com/blog/new-in-chrome-139 https://chromereleases.googleblog.com/2025/08/stable-channel-update-for-desktop.html This update includes 12 security fixes. CVEs: CVE-2025-8576 CVE-2025-8577 CVE-2025-8578 CVE-2025-8579 CVE-2025-8580 CVE-2025-8581 CVE-2025-8582 CVE-2025-8583 (cherry picked from commit aad64d4)
(cherry picked from commit 74587eb)
https://www.mozilla.org/en-US/firefox/141.0.2/releasenotes/ (cherry picked from commit 7b133bd)
https://www.mozilla.org/en-US/firefox/141.0.2/releasenotes/ (cherry picked from commit 11c885d)
(cherry picked from commit be69bd0)
(cherry picked from commit 4ee5f6f)
(cherry picked from commit 0d7c597)
(cherry picked from commit d4bbd68)
(cherry picked from commit 69cec1b)
(cherry picked from commit 25c6858)
Test for linking had to be removed because now the linking is more complex and it would take too much mocking to test it. The test in question was moved to the dashboard codebase that is closed-source, if that helps in any way. (cherry picked from commit a667834)
(cherry picked from commit e066e4e)
(cherry picked from commit 229dc3a)
(cherry picked from commit e2cb442)
(cherry picked from commit ffb03c8)
(cherry picked from commit 89d9c7f)
(cherry picked from commit 5ce0859)
(cherry picked from commit ded369c)
(cherry picked from commit 070af34)
(cherry picked from commit cc9cfb3)
(cherry picked from commit 18ccbfa)
(cherry picked from commit 90c068f)
(cherry picked from commit 5db8ee9)
…fd827f52 -> 2.94.0-pre-20250711_ae00b1298353 (NixOS#432256)
This reverts commit f2648b2. While the idea to never use swap was fine, in practice this meant that when nix ran OOM, some other process was killed instead. This lead to the job not being possible to be cancelled anymore and thus needing to timeout, before subsequent jobs could be scheduled. This can take up to 6 hours for GitHub Actions by default. Re-enabling the swap file to catch this case more gracefully. It's still the goal to never actually *use* the swap file during Eval and just a safeguard. Keeping the changed chunkSize and not reverting it - this makes it slightly less likely to hit the swap file when running with Lix. (cherry picked from commit 9cde368)
None of our jobs is expected to run for 6 hours, the GitHub limit. These limits are generous and take into accounts that some jobs need to wait for others. If jobs exceed these times, most likely something else is wrong and needs investigation. (cherry picked from commit 436d541)
The package was previously busted: there were random things in result/usr, which is very much wrong. I rewrote it to use the meson build since the makefile is pretty highly busted. (cherry picked from commit cea6125)
(cherry picked from commit 15e0c31)
(cherry picked from commit 6ff2be3)
(cherry picked from commit 5b8f2fb)
(cherry picked from commit 283f9c0)
|
The PR's base branch is set to master, but 6490 commits from the release-25.05 branch are included. Make sure you know the right base branch for your changes, then:
|
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
20 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.
Backport of #431468
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.