Skip to content

nixos/containers: warn if containers are used but disabled#269970

Merged
roberth merged 1 commit intoNixOS:masterfrom
emilylange:nixos-containers-warning
Nov 26, 2023
Merged

nixos/containers: warn if containers are used but disabled#269970
roberth merged 1 commit intoNixOS:masterfrom
emilylange:nixos-containers-warning

Conversation

@emilylange
Copy link
Member

Description of changes

This is a follow-up to 8dfe8e4 (#263462).

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/)
  • 23.11 Release Notes (or backporting 23.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.

@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 Nov 25, 2023
@emilylange emilylange mentioned this pull request Nov 25, 2023
13 tasks
@nikstur
Copy link
Contributor

nikstur commented Nov 25, 2023

The diff is very large, did you accidentally format the file?

@emilylange
Copy link
Member Author

The diff is very large, did you accidentally format the file?

I had to add a mkMerge and then indented that section by two spaces.
I can undo that, if you like.
It will just look a bit odd^

Copy link
Contributor

@nikstur nikstur left a comment

Choose a reason for hiding this comment

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

Looks fine to me

@nikstur
Copy link
Contributor

nikstur commented Nov 25, 2023

I can undo that, if you like.

No no all good, it just wasn't immediately obvious what has changed.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 25, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 26, 2023
@roberth
Copy link
Member

roberth commented Nov 26, 2023

Diff without whitespace changes: https://github.com/NixOS/nixpkgs/pull/269970/files?diff=split&w=1
or use the cog menu in the diff view, between the tabs and the first file.

@roberth roberth merged commit ecef65f into NixOS:master Nov 26, 2023
@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

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 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants