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/services.mosquitto: remove with lib; #338022

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

Stunkymonkey
Copy link
Contributor

Description of changes

part of #208242

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

nixos/modules/services/networking/mosquitto.nix Outdated Show resolved Hide resolved
${cfg.package}/bin/mosquitto_passwd -U "$file"
''
++ hashedLines));

authPluginOptions = with types; submodule {
authPluginOptions = with lib.types; submodule {
Copy link
Contributor

Choose a reason for hiding this comment

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

watch out, under this with there's no automatic checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is your suggestion to get rid of this with statement as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, no suggestion as such.

I've found that when I make errors, it's in the following conditions:

  1. nix-instantiate --parse succeeds
  2. Because there's a symbol that was previously looked up in the top-level with
  3. That now is "looked up" in the lower with
  4. And there's no test of the NixOS module that would exercise the code.

nixosTests.mosquitto exists, so I'll definitely run that before merging. But the other "watch out" signals are there.

nixos/modules/services/networking/mosquitto.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/mosquitto.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Running nix-build -A nixosTests.mosquitto now

@Stunkymonkey Stunkymonkey marked this pull request as ready for review August 28, 2024 21:14
@philiptaron philiptaron merged commit f26f92d into NixOS:master Aug 28, 2024
9 of 10 checks passed
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.

2 participants