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.

Sign up for GitHub

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

Jump to bottom

nixos/maubot: init #265368

Merged
merged 3 commits into from
Nov 28, 2023
Merged

nixos/maubot: init #265368

merged 3 commits into from
Nov 28, 2023

Conversation

chayleaf
Copy link
Contributor

@chayleaf chayleaf commented Nov 4, 2023

Description of changes

An attempt to upstream maubot.nix which I've been running on my server for quite a while.

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: documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 4, 2023
@chayleaf chayleaf added the 8.has: module (new) This PR adds a module in `nixos/` label Nov 4, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Nov 4, 2023
asymmetric
asymmetric reviewed Nov 8, 2023
View reviewed changes
Copy link
Contributor

@asymmetric asymmetric left a comment

Choose a reason for hiding this comment

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

For now only grammar changes, I'll try running this later.

nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.md Show resolved Hide resolved
nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild labels Nov 20, 2023
@chayleaf chayleaf force-pushed the maubot branch 2 times, most recently from 060bdbc to a31773e Compare November 20, 2023 21:58
asymmetric
asymmetric approved these changes Nov 26, 2023
View reviewed changes
nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.md Outdated Show resolved Hide resolved
@chayleaf chayleaf force-pushed the maubot branch 5 times, most recently from 7379bc9 to ed583e5 Compare November 26, 2023 20:46
asymmetric
asymmetric approved these changes Nov 27, 2023
View reviewed changes
Copy link
Contributor

@asymmetric asymmetric left a comment

Choose a reason for hiding this comment

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

Tested the update script, works perfectly.

pkgs/tools/networking/maubot/plugins/default.nix Outdated Show resolved Hide resolved
@chayleaf chayleaf force-pushed the maubot branch 4 times, most recently from f8ab450 to 17c737f Compare November 28, 2023 01:13
999eagle
999eagle suggested changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@999eagle 999eagle left a comment

Choose a reason for hiding this comment

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

I've mainly reviewed the new module for now. At least from a cursory look the wrapper and plugins look good though. I like the approach of automatically generating all known plugins!

nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Outdated Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Show resolved Hide resolved
nixos/modules/services/matrix/maubot.nix Show resolved Hide resolved
@chayleaf
Copy link
Contributor Author

chayleaf commented Nov 28, 2023 •
edited
Loading

just added chmod 640 "${cfg.extraConfigFile}" to preStart

999eagle
999eagle approved these changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@999eagle 999eagle left a comment

Choose a reason for hiding this comment

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

I didn't run this on my server but looks good to me now.

@asymmetric
Copy link
Contributor

Alright, let's mere this then!

@asymmetric asymmetric merged commit 7da9947 into NixOS:master Nov 28, 2023
5 of 6 checks passed
@chayleaf chayleaf mentioned this pull request Jun 27, 2024
Open
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@999eagle 999eagle 999eagle approved these changes

@asymmetric asymmetric asymmetric approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chayleaf @asymmetric @999eagle