Skip to content

Update nixpkgs and CMake simplifcations #954

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update nixpkgs and CMake simplifcations #954

wants to merge 11 commits into from
+191 −329

Conversation

stv0g
Copy link
Contributor

@stv0g stv0g commented Sep 1, 2025

No description provided.

@stv0g stv0g requested a review from n-eiling as a code owner September 1, 2025 11:01
@stv0g stv0g changed the title Update nixpkgs Update nixpkgs and CMake simplifcations Sep 1, 2025
@stv0g stv0g mentioned this pull request Sep 3, 2025
Merged
@stv0g stv0g force-pushed the update-nixpkgs branch 3 times, most recently from 89b16ed to 421fa1d Compare September 5, 2025 08:51
@stv0g stv0g requested a review from pjungkamp September 5, 2025 08:52
@stv0g
Copy link
Contributor Author

stv0g commented Sep 5, 2025

@pjungkamp I would be interested in your review on this PR :)

@pjungkamp
Copy link
Contributor

I like the CMake cleanup. Neither villas-common nor villas-fpga are considered as a standalone projects anymore which allows us to strip even more unnecessary boilerplate from the build system.

The only nitpicks I've got is that I'd like to see some formatting improvements on the json_pack calls when you're already touching that code. You took the time to decipher the format string so make it easier for the next person that has to touch that.

pjungkamp
pjungkamp requested changes Sep 5, 2025
View reviewed changes
packaging/nix/reverse-struct-group.patch Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems like we may need this patch once more. This time for Rocky Linux.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the current CI's cached layers for Rocky don't include the linux-headers update yet so the CI doesn't fail currently. But you'll notice that podman build -f packaging/docker/Dockerfile.rocky . will fail when running without cached layers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've upgraded to RockyLinux v10. However the issue still remains.
So, I also re-added the patch to the RockyLinux Dockerfile..

n-eiling
n-eiling requested changes Sep 8, 2025
View reviewed changes
stv0g added 5 commits September 8, 2025 10:22
@stv0g
chore(nix): Update nixpkgs and remove obsolete patches
f9f0577 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
fix(nix): Add some missing build inputs
b2f5c6c 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
fix(doc): Add JOSS paper als new main paper about VILLASnode
862eb09 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
ifx(cmake): Simplify CMakeLists of fpga module
877a798 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
fix(cmake): Remove GetVersion module and simplify overall CMake code
766d28c 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
stv0g and others added 2 commits September 8, 2025 12:03
@stv0g
fix(protobuf): Update auto-generated code
a1f2454 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@pjungkamp @stv0g
fix(formatting): Improve json_pack readability
4861974 
Signed-off-by: Philipp Jungkamp <philipp.jungkamp@rwth-aachen.de>
stv0g added 3 commits September 8, 2025 12:38
@stv0g
fix(linux): Reintroduce patch for struct groups
cd073bd 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
fix(docs): Tweak note about citations
5c68efe 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g
fix(docker): Order package dependencies alphabetically
3e20851 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
n-eiling
n-eiling previously approved these changes Sep 8, 2025
View reviewed changes
@stv0g
chore(docker): Minor bump of RockyLinux version
2208ffb 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
@stv0g stv0g requested a review from pjungkamp September 9, 2025 00:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@n-eiling n-eiling n-eiling left review comments

@pjungkamp pjungkamp Awaiting requested review from pjungkamp

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stv0g @pjungkamp @n-eiling