Skip to content

staging-next-24.11 iteration 2 - 2024-12-31#369690

Merged
vcunat merged 238 commits intorelease-24.11from
staging-next-24.11
Jan 8, 2025
Merged

staging-next-24.11 iteration 2 - 2024-12-31#369690
vcunat merged 238 commits intorelease-24.11from
staging-next-24.11

Conversation

samueltardieu and others added 30 commits November 20, 2024 11:49
(cherry picked from commit ddc3140)
The previous commit removed the handling of `dict` arguments, but
didn’t adjust the type, leading to the following type-checking error:

    test_driver/driver.py:216: error: Argument 1 to "NixStartScript" has incompatible type "str | dict[Any, Any]"; expected "str"  [arg-type]

It also left an unused import that Ruff is unhappy about:

    build/lib/test_driver/driver.py:11:22: F401 [*] `colorama.Fore` imported but unused
    …
    build/lib/test_driver/driver.py:11:28: F401 [*] `colorama.Style` imported but unused

Fixes: 71306e6
(cherry picked from commit d490680)
(cherry picked from commit 12c819e)
@vcunat
Copy link
Member Author

vcunat commented Jan 6, 2025

  • llvm_* tests time out on x86_64-darwin. May retries have been attempted. Roughly 22k jobs are broken by that.

    Resolved by adjusting how infra works. big-parallel jobs now get more cores on *-darwin than before.

mweinelt and others added 14 commits January 6, 2025 18:44
(cherry picked from commit 4c6a1b0)
The old one wouldn't fetch the source anymore.
(cherry picked from commit 5672733)
…9.1,17.0.13.11.1,21.0.5.11.1}

(cherry picked from commit 71936fc from PR #356982)
(cherry picked from commit 1008102 from PR #362194)
Uh, this wouldn't pick cleanly due to mass reformatting (oh yeah),
so some manual fixups were needed.
@vcunat vcunat merged commit aedc34a into release-24.11 Jan 8, 2025
8 checks passed
@vcunat
Copy link
Member Author

vcunat commented Jan 8, 2025

I believe this is now good enough not to block merging anymore.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 4.workflow: staging A staging-next or staging-next-XX.YY branch 6.topic: emacs Text editor 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.