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/unifi: Add the ability to specify extra JVM options #266528

Merged
merged 3 commits into from
Nov 15, 2023

Conversation

lucasbergman
Copy link
Contributor

Description of changes

The first two commits do some throat clearing, just cleaning up some formatting and making the command line args a list instead of a big string. The third commit gives me the ability to give the JVM zany options so I can watch its allocator and GC behavior, or monitor it with Prometheus using something like jmx_exporter.

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 9, 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 labels Nov 9, 2023
@lucasbergman lucasbergman force-pushed the unifi-jvmoptions branch 2 times, most recently from 9c96d2f to bde73ef Compare November 10, 2023 14:59
@lucasbergman
Copy link
Contributor Author

Hi @wegank by chance would you be interested in having a look at this? Forgive me if there's other protocol; I haven't committed to nixpkgs before. No rush.

This removes "with lib", which advances NixOS#208242 a bit, and cleans up a few
formatting nits found by nixfmt.
There's no functionality change here, but this makes it a bit more
convenient to add more args.
This can be useful for adding extra logging, tweaking garbage collector
parameters, and for using JMX to monitor the JVM.
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 12, 2023
@lucasbergman
Copy link
Contributor Author

Thanks very much for the review/approval. Does someone come by and merge this at some point? Sorry, I'm still new at this.

@lucasbergman
Copy link
Contributor Author

Hi @wegank or anyone else, do I need to do anything else for this to get merged?

@wegank
Copy link
Member

wegank commented Nov 15, 2023

I'll merge it.

Would you also like to have a look at #195448 (comment), as I assume you are an active UniFi user? It would be nice if we could upgrade to MongoDB 5.0 for the upcoming release.

@wegank wegank merged commit 1a85914 into NixOS:master Nov 15, 2023
7 checks passed
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 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.

3 participants