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/kresd: fix port only regex #278555

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Conversation

leona-ya
Copy link
Member

@leona-ya leona-ya commented Jan 3, 2024

Description of changes

Currently a list index 1 is out of bounds error is thrown when the port only syntax is used in kresd. Example: services.kresd.listenPlain = [ "53" ]

This regression was introduced in #153610.

The output is expected to be a list [ hostname, port, optional ipv6 scope ], but the current regex only outputs [ port ], when only a port is given as address.
We cannot use () because that's unsupported on darwin (#100592).

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.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.

The output is expected to be a list [ hostname, port, optional ipv6 scope ], but the
current regex only outputs [ port ], when only a port is given as address.
@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 3, 2024
@leona-ya leona-ya requested a review from vcunat January 3, 2024 20:23
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Jan 3, 2024
Copy link
Member

@kloenk kloenk left a comment

Choose a reason for hiding this comment

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

LGTM

deployed on my homeserver (x86_64-linux)

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 7, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3356

@fpletz fpletz merged commit 3432be0 into NixOS:master Jan 29, 2024
23 checks passed
Copy link
Contributor

Successfully created backport PR for release-23.11:

@vcunat
Copy link
Member

vcunat commented Jan 30, 2024

Thanks. I'm sorry for my lack of timely resolution.

@leona-ya leona-ya deleted the kresd-port-only-regex branch January 30, 2024 07:49
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 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.

6 participants