Skip to content

Some CMake v4 fixes#444660

Merged
LordGrimmauld merged 10 commits intoNixOS:staging-nextfrom
nim65s:some-cmake4
Sep 26, 2025
Merged

Some CMake v4 fixes#444660
LordGrimmauld merged 10 commits intoNixOS:staging-nextfrom
nim65s:some-cmake4

Conversation

@nim65s
Copy link
Contributor

@nim65s nim65s commented Sep 20, 2025 •
edited
Loading

Fixed some issues with CMake v4.

All of these build on x86_64-linux:

nom build -L .#trlib .#hpipm .#openscenegraph .#bullet .#libccd .#cxxopts .#pystring .#python3Packages.qdldl .#glew

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 6.topic: python Python is a high-level, general-purpose programming language. labels Sep 20, 2025
bjornfor
bjornfor reviewed Sep 20, 2025
View reviewed changes
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

Commits look good.

emilazy
emilazy reviewed Sep 20, 2025
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Looks generally good, thanks. Not sure about the thrift tests change.

@emilazy
Copy link
Member

emilazy commented Sep 20, 2025

I assume this is why the Thrift tests are not having issues:

thrift> Running phase: checkPhase
thrift> Test project /nix/var/nix/b/2l1yglc532h6rcphm2bcwzj0q3/source/build
thrift> No tests were found!!!

@nim65s nim65s force-pushed the some-cmake4 branch 2 times, most recently from fe1fc7f to c04e761 Compare September 21, 2025 13:11
@nim65s nim65s marked this pull request as draft September 21, 2025 13:12
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. labels Sep 21, 2025
@nim65s nim65s force-pushed the some-cmake4 branch 2 times, most recently from 63d4801 to dfa752f Compare September 21, 2025 14:13
@nim65s nim65s marked this pull request as ready for review September 21, 2025 14:16
@nixpkgs-ci nixpkgs-ci bot closed this Sep 23, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Sep 23, 2025
@vcunat
Copy link
Member

vcunat commented Sep 23, 2025

(cmake 4 is on staging-next already)

@LordGrimmauld LordGrimmauld mentioned this pull request Sep 23, 2025
Merged
4 tasks
@nim65s nim65s mentioned this pull request Sep 23, 2025
Merged
13 tasks
@LordGrimmauld LordGrimmauld mentioned this pull request Sep 23, 2025
Open
@LordGrimmauld LordGrimmauld self-requested a review September 25, 2025 14:39
@nim65s
Copy link
Contributor Author

nim65s commented Sep 25, 2025

Removed pystring following merge of #445327

LordGrimmauld
LordGrimmauld requested changes Sep 25, 2025
View reviewed changes
Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I am still building qldl, osg and trlib, but here are a couple notes.

Two nits, feel free to ignore those, i won't block on them. hpipm and python3Packages.qdldl.meta need adjusting though (imo).

@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Sep 25, 2025

Okay, everything does build

nim65s and others added 8 commits September 26, 2025 08:42
@nim65s
Copy link
Contributor Author

nim65s commented Sep 26, 2025

@LordGrimmauld thanks for the very good review. I've integrated your comments.

LordGrimmauld
LordGrimmauld approved these changes Sep 26, 2025
View reviewed changes
Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

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

Alright, thank you :)
I love to see the unvendoring in qdldl, we should unvendor more things anyways.

I tested everything builds on x86_64-linux, and i can't spot any more issues. Will merge in a bit unless anyone else has any complaints left.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 26, 2025
@LordGrimmauld LordGrimmauld merged commit 2cd3686 into NixOS:staging-next Sep 26, 2025
29 of 32 checks passed
@nim65s nim65s mentioned this pull request Sep 30, 2025
Merged
13 tasks
nim65s added a commit to nim65s/nixpkgs that referenced this pull request Oct 1, 2025
@nim65s
hpipm: 0.1.3-unstable-2025-09-25 -> 0.1.3-unstable-2025-07-25
dd4e5b4 
Back in time to unbreak casadi.
I must have failed something while retesting after NixOS#444660 (comment)
@nim65s nim65s deleted the some-cmake4 branch October 7, 2025 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjornfor bjornfor bjornfor left review comments

@emilazy emilazy emilazy left review comments

@LordGrimmauld LordGrimmauld LordGrimmauld approved these changes

@natsukium natsukium Awaiting requested review from natsukium

@spease spease Awaiting requested review from spease

@aanderse aanderse Awaiting requested review from aanderse

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@lopsided98 lopsided98 Awaiting requested review from lopsided98

@drewrisinger drewrisinger Awaiting requested review from drewrisinger

@aforemny aforemny Awaiting requested review from aforemny

@rastertail rastertail Awaiting requested review from rastertail

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nim65s @emilazy @vcunat @LordGrimmauld @bjornfor @nixos-discourse