Skip to content

Freecad: fix build with vtk 9.5#421276

Merged
K900 merged 2 commits intoNixOS:masterfrom
qbisi:freecad
Jul 9, 2025
Merged

Freecad: fix build with vtk 9.5#421276
K900 merged 2 commits intoNixOS:masterfrom
qbisi:freecad

Conversation

@qbisi
Copy link
Contributor

@qbisi qbisi commented Jun 30, 2025

Use vtkUnstructuredGrid::GetLinks instead of vtkUnstructuredGrid::GetCellLinks
See FreeCAD/FreeCAD#22221.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 30, 2025
@qbisi qbisi marked this pull request as ready for review June 30, 2025 16:04
@nix-owners nix-owners bot requested a review from LordGrimmauld June 30, 2025 16:05
@LordGrimmauld
Copy link
Contributor

Is this actually necessary yet? As far as i can tell, vtk is on 9.2.6 and not even your vtk bump (#407910) does 9.5. Also, CI is failing...

I'll look at this in more detail later, but some more explanation would be nice.

@qbisi
Copy link
Contributor Author

qbisi commented Jun 30, 2025

vtk 9.5 draft pr is here. #417613.

No idea why CI is failing.

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.

Okay, does build, CI passes, and the upstream patch looks reasonable. However...

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jul 1, 2025
@qbisi qbisi mentioned this pull request Jul 8, 2025
13 tasks
@qbisi
Copy link
Contributor Author

qbisi commented Jul 9, 2025

@LordGrimmauld do you have the right to merge this, i am about to open the draft pr #417613.

@LordGrimmauld
Copy link
Contributor

I do not have commit bit, no.

@qbisi
Copy link
Contributor Author

qbisi commented Jul 9, 2025

Since the diff is under pkgs/by-name and you are the maintainer of freecad, can you try @nixpkgs-merge-bot .

@K900 K900 merged commit 48d2430 into NixOS:master Jul 9, 2025
54 of 57 checks passed
@LordGrimmauld
Copy link
Contributor

merge bot only works for trusted PR authors, such as r-ryantm

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants