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

nixos/oci-containers: option to set the service name of a oci-ontainer #370089

Merged

Conversation

lucasew
Copy link
Contributor

@lucasew lucasew commented Jan 2, 2025

Shouldn't do a single rebuild

  • nixos/oci-containers: option to set the service name of a oci-container

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 2, 2025
@lucasew lucasew force-pushed the 20250102-oci-containers-service-name branch 2 times, most recently from fb63e14 to ef0c2ae Compare January 2, 2025 01:41
@lucasew lucasew marked this pull request as draft January 2, 2025 01:41
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 2, 2025
@lucasew lucasew force-pushed the 20250102-oci-containers-service-name branch from ef0c2ae to c819df3 Compare January 2, 2025 01:45
@lucasew lucasew marked this pull request as ready for review January 2, 2025 01:46
@lucasew lucasew force-pushed the 20250102-oci-containers-service-name branch from c819df3 to d010389 Compare January 2, 2025 01:51
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM

@adisbladis adisbladis removed their request for review January 2, 2025 07:50
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 2, 2025
@lucasew lucasew requested a review from thiagokokada January 4, 2025 00:09
@lucasew lucasew added the backport release-24.11 Backport PR automatically label Jan 4, 2025
@GaetanLepage GaetanLepage merged commit af96c38 into NixOS:master Jan 4, 2025
26 of 27 checks passed
@nix-backports
Copy link

nix-backports bot commented Jan 4, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-370089-to-release-24.11 origin/release-24.11
cd .worktree/backport-370089-to-release-24.11
git switch --create backport-370089-to-release-24.11
git cherry-pick -x d01038921c03a0237a1a23cb4b7ad94ca94036a5

@lucasew lucasew deleted the 20250102-oci-containers-service-name branch January 4, 2025 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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 backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants