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/movim: init, movim: additions + patches #296641

Merged
merged 6 commits into from Apr 11, 2024

Conversation

toastal
Copy link
Contributor

@toastal toastal commented Mar 17, 2024

Description of changes

Added Movim as a service. This includes a few awaiting-review patches to upstream on Movim’s Microsoft GitHub proprietary code forge--some are for making NixOS work better & I needed to move to the latest commit to avoid the patches conflicts for:

Additionally:

  • A few paths needed patching
  • ImageMagick patch fixes were closed since 6.x is current support, but Nix will be using 7.x

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.

1

Footnotes

  1. Please consider giving up MS GitHub or offering a non-proprietary, non-US-corporate-controlled mirror for this free software project.
    I wish to delete this Microsoft account in the future, but I need more projects like this to support alternative methods to send patches & contribute.

@toastal toastal force-pushed the movim-service branch 4 times, most recently from a88f8f6 to 7a7d4ec Compare April 8, 2024 06:41
@Lassulus
Copy link
Member

Lassulus commented Apr 8, 2024

yoyo, is this ready for merging? I guess we can also fix stuff later?

@toastal
Copy link
Contributor Author

toastal commented Apr 8, 2024 via email

@toastal toastal force-pushed the movim-service branch 4 times, most recently from 44c385a to df39176 Compare April 10, 2024 16:16
Version is ‘weird’ to deal with the composer script
++ lib.optional cfg.database.createLocally dbService;
};

tmpfiles.settings = with cfg; {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
tmpfiles.settings = with cfg; {
tmpfiles.settings.movil = with cfg; {

you need to specify the filename/namespace also

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm… actually reading about it & many of these files aren’t actually temporary, but I initially copied from a different, similar PHP project. One sec.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like others that are linking out of their builds like this are still using tmpfiles. Not 100% sure, but I did see most are using "10-${pname}"-like entries

@Lassulus Lassulus merged commit 4cde911 into NixOS:master Apr 11, 2024
25 checks passed
@toastal toastal deleted the movim-service branch April 12, 2024 13:30
@toastal toastal restored the movim-service branch April 28, 2024 09:12
@Neustradamus
Copy link

@toastal: Good job!

@toastal
Copy link
Contributor Author

toastal commented May 13, 2024

@Neustradamus Thanks. Are you using it to success? And does it meet your needs?

@Neustradamus
Copy link

@toastal: I do not use your code but it is a good news for XMPP users in the World :)

@toastal
Copy link
Contributor Author

toastal commented May 14, 2024

Roger. @Neustradamus if you ever need anything, reach out on XMPP

@toastal toastal deleted the movim-service branch May 15, 2024 10:45
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.

None yet

3 participants