Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vtk: clean up / reduce code repetition #107617

Merged
merged 5 commits into from Dec 26, 2020
Merged

Conversation

lheckemann
Copy link
Member

Motivation for this change

This refactors the vtk expressions to use a generic base expression,
which is used for all 3 versions.

vtk 7.x no longer uses gcc 8, since the quirk of it not building with
gcc 9 seems to have been fixed.

This also makes the python bindings available for all 3 versions, and
fixes building them for vtk 8 by adding a patch.

cc @tfmoraes @knedlsepp I've listed you as maintainers for all 3 versions, hope that's alright — if not we can of course change that back. I've also added myself.

Things done
  • Built all combinations of (pkgs, python3Packages, python2Packages).(vtk_7, vtk_8, vtk_9)
  • Fits CONTRIBUTING.md.

This refactors the vtk expressions to use a generic base expression,
which is used for all 3 versions.

vtk 7.x no longer uses gcc 8, since the quirk of it not building with
gcc 9 seems to have been fixed.

This also makes the python bindings available for all 3 versions, and
fixes building them for vtk 8 by adding a patch.
pkgs/development/libraries/vtk/generic.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/vtk/generic.nix Outdated Show resolved Hide resolved
@lheckemann
Copy link
Member Author

@ofborg build vtk_7 vtk_8 vtk_9 python2Packages.vtk_7 python2Packages.vtk_8 python2Packages.vtk_9 python3Packages.vtk_7 python3Packages.vtk_8 python3Packages.vtk_9

Copy link
Member

@prusnak prusnak left a comment

Choose a reason for hiding this comment

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

It seems counterintuitive that python3Packages.vtk points to python3Packages.vtk_7 while pkgs.vtk points to pkgs.vtk_8. Is there a good reason for that?

@lheckemann
Copy link
Member Author

@prusnak only that that's no change from before (which in turn might be because vtk 8 didn't build with python 3 prior to this PR). I do want to clean that up and see if I can update all the dependents to vtk 9 once this is merged.

@knedlsepp
Copy link
Member

Thanks for the cleanup and marking myself as maintainer on the remaining versions.

@tfmoraes
Copy link
Contributor

@lheckemann good idea. Thanks for the modifications!

@lheckemann lheckemann merged commit e71634e into NixOS:master Dec 26, 2020
@lheckemann lheckemann deleted the vtk-cleanup branch December 26, 2020 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants