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

ejabberd: 23.10 -> 24.07 #320617

Merged
merged 5 commits into from
Oct 21, 2024
Merged

ejabberd: 23.10 -> 24.07 #320617

merged 5 commits into from
Oct 21, 2024

Conversation

chuangzhu
Copy link
Contributor

@chuangzhu chuangzhu commented Jun 17, 2024 •
edited
Loading

Description of changes

Solves #292110

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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jun 17, 2024
@chuangzhu chuangzhu mentioned this pull request Jun 17, 2024
Closed
1 task
@ofborg ofborg bot requested review from abbradar and svanderburg June 17, 2024 21:59
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jun 17, 2024
@jpds
Copy link
Contributor

jpds commented Jun 17, 2024

We need a way to handle the optional deps, my ejabberd instance uses SQLite and I got:

ejabberdctl[526]: 2024-06-17 22:05:03.285680+00:00 [critical] Failed to start Erlang application 'sqlite3': no such file or directory: sqlite3.app. This usually means that ejabberd or Erlang was compiled/installed incorrectly.

@chuangzhu
Copy link
Contributor Author

We need a way to handle the optional deps

Fixed, thanks for spotting that!

@toastal
Copy link
Contributor

toastal commented Jun 18, 2024

This looks like a lot of non-trivial work for a version bump. Great job @chuangzhu for being able to overcome it & cover the test cases too.

@chuangzhu
Copy link
Contributor Author

I rebased the commit for a minor cleanup

@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-ready-for-review/3032/4138

@chuangzhu chuangzhu changed the title ejabberd: 23.10 -> 24.02 ejabberd: 23.10 -> 24.06 Jun 28, 2024
@chuangzhu chuangzhu changed the title ejabberd: 23.10 -> 24.06 ejabberd: 23.10 -> 24.07 Jul 18, 2024
chuangzhu added 5 commits July 19, 2024 03:00
@chuangzhu
ejabberd: 23.10 -> 24.02
89ea599
@chuangzhu
nixos/tests/ejabberd: fix tests
6f55102 
It seems that SASL SCRAM in ejabberd now requires TLS to work, even if
disable_sasl_scram_downgrade_protection is true. The certificate
generation code is copied from nixos/tests/prosody.
@chuangzhu
ejabberd: handle optional deps
90484c7
@chuangzhu
ejabberd: 24.02 -> 24.06
845ef60
@chuangzhu
ejabberd: 24.06 -> 24.07
8fefd4d
@chuangzhu chuangzhu added the needs_reviewer (old Marvin label, do not use) label Oct 21, 2024
FliegendeWurst
FliegendeWurst approved these changes Oct 21, 2024
View reviewed changes
Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

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

Builds & NixOS test passses

@happysalada happysalada merged commit a71d327 into NixOS:master Oct 21, 2024
28 checks passed
@happysalada
Copy link
Contributor

Hey, for anything beam related you can tag @NixOS/beam to get a review

@FliegendeWurst FliegendeWurst removed the needs_reviewer (old Marvin label, do not use) label Oct 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FliegendeWurst FliegendeWurst FliegendeWurst approved these changes

@abbradar abbradar Awaiting requested review from abbradar

@svanderburg svanderburg Awaiting requested review from svanderburg

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 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.
6 participants
@chuangzhu @jpds @toastal @nixos-discourse @happysalada @FliegendeWurst