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: move matrix services into their category #172819

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Conversation

McSinyx
Copy link
Member

@McSinyx McSinyx commented May 13, 2022

Description of changes

This better organize Matrix-related services. IMHO the matrix- prefix should be drop from the names, but I'm not sure if the backward incompatibility is worth it.

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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@McSinyx McSinyx requested a review from piegamesde as a code owner May 13, 2022 07:58
@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 May 13, 2022
@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 May 13, 2022
@piegamesde
Copy link
Member

How would removing the matrix- prefix additionally break things? If somebody relies on the module path, this is already a breaking change.

@McSinyx
Copy link
Member Author

McSinyx commented May 13, 2022 via email

@piegamesde
Copy link
Member

No. Those names should not be touched, and are not redundant. Conduit for example explicitly requested to be packaged as matrix-conduit, and the module name should match the pname if possible.

What is redundant though is the new module file path: ./services/matrix/matrix-conduit.nix. I think this could safely be shortened to ./services/matrix/conduit.nix (same for the others)

@ajs124
Copy link
Member

ajs124 commented May 13, 2022

You could do something like services.matrix.(synapse|conduit), but we don't really do that for anything else, like http, smtp, sql, etc. And that could be done in a backwards-compatible manner with mkRenamedOptionModule.

@piegamesde
Copy link
Member

Based on the experience with services.xserver, I don't think that would be a good idea either.

@McSinyx
Copy link
Member Author

McSinyx commented May 14, 2022

What is redundant though is the new module file path: ./services/matrix/matrix-conduit.nix. I think this could safely be shortened to ./services/matrix/conduit.nix (same for the others)

That sounds good, I've updated the patch.

@Artturin Artturin added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 18, 2022
@McSinyx
Copy link
Member Author

McSinyx commented May 24, 2022

Gentle ping!

@bobby285271 bobby285271 added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels May 29, 2022
@Artturin Artturin removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jun 6, 2022
@McSinyx
Copy link
Member Author

McSinyx commented Jun 10, 2022

Gentle ping!

@piegamesde piegamesde merged commit 4ebc288 into NixOS:master Jun 10, 2022
@McSinyx McSinyx deleted the matrix branch June 10, 2022 09:00
@dali99 dali99 mentioned this pull request Jan 5, 2024
13 tasks
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.

6 participants