Skip to content

Nix/Flake: Modernize Toolchain (25.05 -> 26.05) - #13

Merged
phip1611 merged 10 commits into
mainfrom
update
Aug 17, 2026
Merged

phip1611 merged 10 commits into
mainfrom
update

Conversation

@phip1611

Copy link
Copy Markdown
Member

Update to nixpkgs @ nixos-26.05.

Part of https://github.com/cobaltcore-dev/cobaltcore/issues/614.

Updates to glibc and other parts of the toolchain made this workaround
irrelevant.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
flake-parts: 2025-04-02T01:38:40+02:00 -> 2026-08-02T01:46:09+02:00
pre-commit-hooks: 2025-05-16T07:19:14+02:00 -> 2026-07-17T13:40:35+02:00

This commit was generated via:
nix run github:phip1611/nixos-configs#flake-update-and-commit

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
@phip1611 phip1611 self-assigned this Aug 17, 2026
@phip1611
phip1611 requested review from amphi and hertrste August 17, 2026 08:20
@phip1611 phip1611 changed the title Nix/Flake: Modernize Toolchain Nix/Flake: Modernize Toolchain (25.05 -> 26.05) Aug 17, 2026
Comment thread .typos.toml Resolved
On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
Comment thread nix/build-cmake-project.nix Outdated
Comment on lines +25 to +27
checkInputs = [ catch2_3 ];

nativeBuildInputs = [
catch2_3

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is it really necessary to move catch2_3 into nativeBuildInputs? You explicitly add catch2_3 to the devShell's packages,

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

you are right. not needed. nice catch!

@hertrste hertrste left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice

@amphi amphi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Just left one questions, but I have no hard opinion on that.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
Keep this access explicit. GCC 15 can otherwise incorrectly diagnose the
std::find_if implementation as reading past the object when the array
is obtained from the fixed BDA address.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
@phip1611
phip1611 enabled auto-merge August 17, 2026 09:05
@phip1611
phip1611 added this pull request to the merge queue Aug 17, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 17, 2026
Caused by the toolchain update.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
@phip1611
phip1611 enabled auto-merge August 17, 2026 09:10
@phip1611
phip1611 added this pull request to the merge queue Aug 17, 2026
Merged via the queue into main with commit bdde471 Aug 17, 2026
11 checks passed
@phip1611
phip1611 deleted the update branch August 17, 2026 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants