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

Improvements for Prosody #27716

Closed
wants to merge 15 commits into from
Closed

Improvements for Prosody #27716

wants to merge 15 commits into from
+175 −58

Conversation

sshisk
Copy link
Contributor

@sshisk sshisk commented Jul 28, 2017

Motivation for this change

Hi! This is mostly new lua modules for Prosody, for example luadbi, but additionally some changes in NixOS module. It was tested for several months.

Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

fpletz
fpletz approved these changes Jul 28, 2017
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Code looks fine to me. Thanks especially for splitting the changes nicely into different commits!

I'm going to test these changes why my current prosody installations.

@sshisk
Copy link
Contributor Author

sshisk commented Jul 28, 2017

I have fixed invalid argument name for DBI support, withDBI, and rebased. Please tell me if I should have pushed it as an extra commit...

@fpletz
Copy link
Member

fpletz commented Jul 29, 2017

That's fine! Just rebase your changes into the appropriate commits like you did. Thanks!

@fpletz fpletz 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/` 8.has: package (update) This PR updates a package to a newer version labels Jul 29, 2017
@fpletz fpletz added this to the 17.09 milestone Jul 29, 2017
@fpletz fpletz added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 30, 2017
@florianjacob
Copy link
Contributor

I'm in the process of moving my prosody server to NixOS, and this looks exactly like what I need. 😄

@sshisk Do you think you can resolve the current conflicts to get this merged?
If you don't have the time, maybe I can take this over.

@florianjacob florianjacob mentioned this pull request Oct 30, 2017
Merged
8 tasks
@florianjacob
Copy link
Contributor

Rebased and conflict-resolved version at #31006

@fpletz
Copy link
Member

fpletz commented Nov 9, 2017

Thanks a lot @florianjacob! And @sshisk of course! Let's continue in #31006.

@fpletz fpletz closed this Nov 9, 2017
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 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/` 8.has: package (update) This PR updates a package to a newer version 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sshisk @fpletz @florianjacob @Janik-Haag