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: backport fix for regression causing NixOS test failure #274720

Merged
merged 1 commit into from
Dec 16, 2023

Conversation

amarshall
Copy link
Member

@amarshall amarshall commented Dec 16, 2023

Description of changes

Should fix nix-build -A podman.passthru.tests, see bug report #274655

See also upstream:

containers/conmon#476
containers/conmon#475
containers/conmon#477

Things done

Ran nix-build -A podman.passthru.tests

Result of nixpkgs-review run on x86_64-linux 1

13 packages built:
  • buildah
  • buildah.man
  • conmon
  • cri-o
  • cri-o.man
  • krunvm
  • out-of-tree
  • podman
  • podman.man
  • singularity
  • singularity-overriden-nixos
  • udocker
  • udocker.dist
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 16, 2023
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

LGTM, let's wait the end of the eval and tests.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 16, 2023
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

ofborg green, thanks for the fix.

@NickCao NickCao merged commit 1d3aaa3 into NixOS:master Dec 16, 2023
25 of 26 checks passed
@amarshall amarshall deleted the fix-podman-conmon branch December 16, 2023 15:30
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 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants