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/samba: accept lists #341244

Merged
merged 1 commit into from
Sep 14, 2024
Merged

nixos/samba: accept lists #341244

merged 1 commit into from
Sep 14, 2024

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Sep 11, 2024

Description of changes

fixes a regression introduced in #302681

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.

@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 Sep 11, 2024
@dotlambda dotlambda marked this pull request as draft September 11, 2024 20:28
@@ -5,7 +5,9 @@ with lib;
let
cfg = config.services.samba;

settingsFormat = pkgs.formats.ini { };
settingsFormat = pkgs.formats.ini {
listToValue = lib.concatMapStringsSep " " (generators.mkValueStringDefault { });
Copy link
Member Author

Choose a reason for hiding this comment

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

This could be

Suggested change
listToValue = lib.concatMapStringsSep " " (generators.mkValueStringDefault { });
listToValue = lib.concatStringsSep " ";

using #341248

@dotlambda dotlambda marked this pull request as ready for review September 11, 2024 20:50
@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 Sep 12, 2024
@anthonyroussel anthonyroussel added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 13, 2024
@dotlambda
Copy link
Member Author

If nobody wants to review this while they are reviewing other samba-related PRs, I'll just merge it myself.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 13, 2024
@Aleksanaa Aleksanaa merged commit 36316ed into NixOS:master Sep 14, 2024
23 checks passed
@dotlambda dotlambda deleted the samba branch September 14, 2024 07: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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants