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/teeworlds: add more configuration options #247668

Merged
merged 2 commits into from
Feb 19, 2024

Conversation

jtbx
Copy link
Member

@jtbx jtbx commented Aug 7, 2023

Description of changes

Added more configuration options to the Teeworlds NixOS module, reduced repetition by adding functions to help generate teeworlds.cfg, fixed some minor mistakes in option descriptions and made "unnamed server" the default value for name.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.

Copy link
Member

@nagy nagy left a comment

Choose a reason for hiding this comment

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

I like the overall intent of this. But I am a bit torn on whether or not we should track the default values ourselves. This has a chance that they diverge from upstream, but it allows us to use them in some other ways during evaluation.

One thing down in ExecStart you should use cfg.package , now that you have introduced it. For some reason I cannot comment on that line.

@jtbx
Copy link
Member Author

jtbx commented Oct 18, 2023

Is it possible for this to get merged by any chance? @SuperSandro2000 @wegank

- add 'package' option
- add 'game' and 'server' attrset
- reduce repetition by using functions bool and optionalSetting
- add default value for cfg.name
- revise some option descriptions
@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-already-reviewed/2617/1445

@SuperSandro2000 SuperSandro2000 merged commit a332040 into NixOS:master Feb 19, 2024
24 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.

5 participants