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

conmon: 0.0.1pre52_6905a4d -> 0.2.0 #62213

Merged
merged 1 commit into from Jun 11, 2019
Merged

Conversation

saschagrunert
Copy link
Member

Update conmon to v0.2.0 and move it into a dedicated package. Since we
are now using conmon as dedicated package, cri-o does not need to built
it, too.

cc @vdemeester @thoughtpolice

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

Thank you 😍
LGTM 💃

Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

I'm unsure of some of the changes in this PR, so requesting feedback. Please feel free to clarify anything that I might have misunderstood.

pkgs/applications/virtualization/conmon/default.nix Outdated Show resolved Hide resolved
pkgs/applications/virtualization/conmon/default.nix Outdated Show resolved Hide resolved

nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
Copy link
Member

Choose a reason for hiding this comment

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

What's the intent of checking if glibc is null? Why do we now need the glibc.static input? I assume you 1) want to make the binary static (which I suppose is fine, but should be handled with a flag IMO anyway or simply enabled unilaterally in all cases with a justification), or 2) make this buildable with Musl (but that won't be possible with this change anyway AFAICS, because the systemd buildInput is incompatible with musl as the libc. You really should instead be using pkgsCross or pkgsMusl to use musl as the libc on your end as a nixpkgs user, and this expression should instead check stdenv.hostPlatform.isMusl to conditionally include things in the buildInputs or not)

Copy link
Member Author

Choose a reason for hiding this comment

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

The main reason behind this is to build it with musl libc and I managed to get systemd (or just the library part) to be built with musl. I changed the optional to stdenv.hostPlatform.isMusl.

pkgs/applications/virtualization/conmon/default.nix Outdated Show resolved Hide resolved
@saschagrunert
Copy link
Member Author

Thanks for the valuable feedback @thoughtpolice, I appreciate it! One discussion point seems still open for me, where I'm not sure if the implementation is correct. PTAL.

@saschagrunert
Copy link
Member Author

@thoughtpolice @vdemeester A friendly ping to not forget about me :)

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🤗

@thoughtpolice
Copy link
Member

@saschagrunert Sorry for the delay -- please see one final nit, I think it might have just been a simple typo!

Update conmon to v0.2.0 and move it into a dedicated package. Since we
are now using conmon as dedicated package, cri-o does not need to built
it, too.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
@saschagrunert
Copy link
Member Author

Alright thanks, I fixed the mentioned issue. :) PTAL

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build conmon

@thoughtpolice thoughtpolice merged commit 3577443 into NixOS:master Jun 11, 2019
@thoughtpolice
Copy link
Member

@saschagrunert Done, sorry for the delay on this! If I have any changes to make later on I'll follow up with my own PR and cc you.

@saschagrunert saschagrunert deleted the conmon branch June 11, 2019 17:48
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

3 participants