Commit Graph

52 Commits

Author SHA1 Message Date
Félix Baylac-Jacqué
23b12701a4
prosody: remove ninjatrappeur from maintainers
I give up on that one.
2022-05-02 12:43:19 +02:00
Félix Baylac-Jacqué
20693a1e73
prosody: 0.11.13 -> 0.12.0
See https://blog.prosody.im/prosody-0.12.0-released for more
informations.

We remove the various lua wrappers introduced by
6799a91843 and
16d0b4a69f. It seems like we don't need
them anymore. I'm not brave enough to dig into the Lua machinery to
see what resolved that. Sorry, you'll have to trust me on that one.

We should probably think about the migration from http_upload to
http_file_share for the NixOS module. It's not trivial, we need to
make sure we don't break the already uploaded URLs.
2022-05-02 12:43:19 +02:00
zowoq
6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
arcnmx
6799a91843 Revert "prosody: work around makeWrapper bug"
This reverts commit 16d0b4a69f.
2022-02-20 09:47:28 -08:00
Izorkin
7629826b03
nixos/tests/prosody: return prosody-mysql test 2022-02-18 22:23:13 +03:00
Izorkin
bc3994e14a
prosody: 0.11.12 -> 0.11.13 2022-02-18 22:23:13 +03:00
arcnmx
377f4b2f0b prosody: optional luaEnv customization
This allows an override to add dependencies in the way that
`withExtraLibs` enabled in the past.
2022-02-11 14:45:22 -08:00
arcnmx
16d0b4a69f prosody: work around makeWrapper bug
This seems to have been caused by #128503, because the values to be
prefixed contain special/wildcard characters.
2022-02-11 14:45:22 -08:00
arcnmx
0c1cf5c7b4 prosody: set lua env in wrapper
This seems to be fallout from #136615
2022-02-11 14:45:22 -08:00
Félix Baylac-Jacqué
3469429c39
prosody: remove outdated passthrough test reference
4369bebd9a removed the prosody-mysql
test. We forgot to remove the associated passthru test entry in the
prosody derivation.
2022-01-15 16:41:13 +01:00
Andreas Rammhold
8b8fbbf1fa prosody: 0.11.10 -> 0.11.12
This fixes CVE-2022-0217 [0].

[0] https://prosody.im/security/advisory_20220113/
2022-01-14 22:24:29 +01:00
Matthieu Coudron
496b8abf78 Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-12 03:03:56 +02:00
Matthieu Coudron
0b6d33c2ed prosody: simplify lua aspects 2021-09-12 03:02:55 +02:00
ajs124
b977d45922 prosody: 0.11.9 -> 0.11.10
fix CVE-2021-37601

annoucement: https://blog.prosody.im/prosody-0.11.10-released/
2021-08-06 13:16:33 +02:00
Andreas Rammhold
ded32d9192
prosody: 0.11.8 -> 0.11.9
The prosody project has issues a new [release] and published security
[advisory] for CVE-2021-32918, CVE-2021-32920, CVE-2021-32921,
CVE-2021-32917 and CVE-2021-32919.

[advisory]: https://prosody.im/security/advisory_20210512/
[release]: https://blog.prosody.im/prosody-0.11.9-released/
2021-05-13 19:32:28 +02:00
Félix Baylac-Jacqué
878e12fb80
prosody: 0.11.7 -> 0.11.8
It's a minor release, there's no major improvement/breaking change.

See https://blog.prosody.im/prosody-0.11.8-released/ for the full changelog.
2021-02-26 18:33:44 +01:00
Ben Siraphob
872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
arcnmx
e2ade56177 prosody: install prosody-migrator tool 2020-10-31 17:56:10 -07:00
Andreas Rammhold
378f9d4010
prosody: 0.11.6 -> 0.11.7 2020-10-05 15:22:16 +02:00
Félix Baylac-Jacqué
b47cabb6ac
prosody: 0.11.5 -> 0.11.6
See https://blog.prosody.im/prosody-0.11.6-released/ for the release
notes.
2020-09-11 08:38:18 +02:00
Julien Moutinho
ddd897c2b4 prosody: update community modules to revision 2dcbc01c9931 2020-08-08 12:05:21 +02:00
Félix Baylac-Jacqué
ac9a44eff9
prosody: add passthru tests 2020-05-24 21:25:20 +02:00
Félix Baylac-Jacqué
8aea528872
nixos/prosody: make defaults comply with XEP-0423
Setting up a XMPP chat server is a pretty deep rabbit whole to jump in
when you're not familiar with this whole universe. Your experience
with this environment will greatly depends on whether or not your
server implements the right set of XEPs.

To tackle this problem, the XMPP community came with the idea of
creating a meta-XEP in charge of listing the desirable XEPs to comply
with. This meta-XMP is issued every year under an new XEP number. The
2020 one being XEP-0423[1].

This prosody nixos module refactoring makes complying with XEP-0423
easier. All the necessary extensions are enabled by default. For some
extensions (MUC and HTTP_UPLOAD), we need some input from the user and
cannot provide a sensible default nixpkgs-wide. For those, we guide
the user using a couple of assertions explaining the remaining manual
steps to perform.

We took advantage of this substential refactoring to refresh the
associated nixos test.

Changelog:
- Update the prosody package to provide the necessary community
  modules in order to comply with XEP-0423. This is a tradeoff, as
  depending on their configuration, the user might end up not using them
  and wasting some disk space. That being said, adding those will
  allow the XEP-0423 users, which I expect to be the majority of
  users, to leverage a bit more the binary cache.
- Add a muc submodule populated with the prosody muc defaults.
- Add a http_upload submodule in charge of setting up a basic http
  server handling the user uploads. This submodule is in is
  spinning up an HTTP(s) server in charge of receiving and serving the
  user's attachments.
- Advertise both the MUCs and the http_upload endpoints using mod disco.
- Use the slixmpp library in place of the now defunct sleekxmpp for
  the prosody NixOS test.
- Update the nixos test to setup and test the MUC and http upload
  features.
- Add a couple of assertions triggered if the setup is not xep-0423
  compliant.

[1] https://xmpp.org/extensions/xep-0423.html
2020-04-30 20:39:54 +02:00
Martin Milata
ce2a2afac7 prosody: 0.11.3 -> 0.11.5
- https://prosody.im/doc/release/0.11.4
- https://prosody.im/doc/release/0.11.5
2020-03-31 04:27:23 +02:00
R. RyanTM
ca903a46bd prosody: 0.11.2 -> 0.11.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/prosody/versions
2019-10-07 19:36:52 -07:00
Alexei Robyn
8c76de9b16 prosody: Update for Lua search path handling change 2019-09-01 17:42:20 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Alexei Robyn
274715cbc3 luaPackages: Replace all rockspec packages with generated ones
luaPackages replaced by generated ones:
- bit32
- compat53
- cqueues
- luacyrussasl -> cyrussasl (luarocks name)
- luaexpat
- luadbi -> luadbi front-end module + separate backend modules
  luadbi-{mysql,postgresql,sqlite3}
- luafilesystem
- luaossl
- luasec
- luasocket
- luastdlib -> stdlib (luarocks name)
- lrexlib -> lrexlib-pcre (we already have lrexlib-gnu and
  lrexlib-posix, lrexlib-pcre however appears to be the variant used in
  mudlet, which is the only current dep in nixpkgs)
- luasqlite -> luasql-sqlite3 (luarocks name)
- lfs -> luafilesytem (we literally had two manually written
  luafilesystem expressions, under different names)

Changes and additions to overrides to generated luarocks packgaes,
including:
- busted: Install bash completions along with the zsh ones
- cqueues:
    - Perform minor surgery on the rockspec to allow using a single
      rockspec to build for all supported Lua versions
    - Add a patch by @vcunat to work around a build issue
- luuid: Wrote a tiny patch to allow for Lua 5.1/Luajit compatibility
- General changes:
    - Sorted the packages
    - Attempted to make the formatting consistent
    - Preferenced `.override` instead of `.overrideAttrs` wherever
      possible

Minor changes to other packages to adjust for the Lua package changes:
- luakit expression simplified
- prosody expression simplified; but users will now need to specify the
  luadbi backend module they intend to use in withExtraLibs
- knot-resolver inputs correctd
- mudlet inputs corrected (although this package was and should still be
  broken)
2019-06-14 13:17:15 +10:00
Andreas Rammhold
cd682b7c10
prosody: update communityModules
After the latest automatic updates of the prosody package the community
modules were partially incompatible. The worst effect I suffered was a
very high timeout (hours) on reconnects due to the stanza module throwing a
runtime error on the server.

We should probably try harder to keep them in sync.
2019-02-04 11:14:08 +01:00
R. RyanTM
80f6e34ef0 prosody: 0.11.1 -> 0.11.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/prosody/versions
2019-01-16 17:52:32 -08:00
R. RyanTM
5b9aa05522 prosody: 0.10.2 -> 0.11.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/prosody/versions
2018-12-16 23:54:20 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Andreas Rammhold
83e4f66347
prosody: 0.10.1 -> 0.10.2
Fixes CVE-2018-10847 [1] and a bunch of minor things [2].

[1] https://prosody.im/security/advisory_20180531/
[2] http://blog.prosody.im/prosody-0-10-2-security-release/
2018-06-03 10:05:32 +02:00
R. RyanTM
43a28c2083 prosody: 0.10.0 -> 0.10.1 (#40645)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/prosody/versions.

These checks were done:

- built on NixOS
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosody passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosodyctl had a zero exit code or showed the expected version
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosody-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosodyctl-wrapped had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 0.10.1 with grep in /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1
- directory tree listing: https://gist.github.com/e1e8caae1a498d8e07f1c35d990846d3
- du listing: https://gist.github.com/9b3a9c7a8711da781e548e894e848cdc
2018-05-17 22:26:35 +02:00
Robin Gloster
0a80f2c0f4
prosody: improve module handling 2018-03-22 03:40:46 +01:00
Florian Jacob
2c0b230330 prosody: update community modules 2018-03-12 20:19:07 +01:00
Florian Jacob
226965da67 prosody: 0.9.12 -> 0.10.0
updating config options, removing luazlib as mod_compression was removed
for security reasons.
2018-03-12 20:19:03 +01:00
Markus Kohlhase
1898496be7 prosody: remove flosse from the list of maintainers 2017-11-06 15:54:15 +01:00
Satoshi Shishiku
ae4579e0cb prosody.communityModules: 590ac12b7671 -> 9a3e51f348fe 2017-11-01 13:38:02 +01:00
Satoshi Shishiku
988ce5433f prosody: support for DBI, extra community modules and extra Lua libraries 2017-11-01 13:38:00 +01:00
uwap
a616f4ec9b prosody: 0.9.10 -> 0.9.12 (#24269) 2017-03-25 20:14:12 +01:00
Marius Bakke
4a7d31a392 treewide: remove double quotes from wrappers
Close #14753; see that for context.
2016-06-22 11:12:27 +02:00
JC Brand
007c558be8 prosody: 0.9.8 -> 0.9.10 2016-02-10 18:26:32 +00:00
koral
1b4722ac82 prosody: add dependency on zlib (close #6894)
@vcunat moved the defaults inside the prosody expression.
2015-04-09 18:40:20 +02:00
William A. Kennington III
7b5f6ca9ba prosody: 0.9.7 -> 0.9.8 2015-03-26 16:41:05 -07:00
koral
a57ec23d55 prosody: added luaevent dependency. 2015-02-19 21:07:23 +01:00
Markus Kohlhase
6989736730 nixpkgs: prosody 0.9.6 -> 0.9.7 2015-01-07 09:55:22 +00:00
Markus Kohlhase
bc86dfa6b5 prosody: updated to v0.9.6 2014-10-29 21:11:25 +01:00
Joachim Schiele
9d5431d1a2 Merge pull request #4536 from flosse/prosody
prosody: updated to v0.9.5
2014-10-15 09:41:48 +02:00
Markus Kohlhase
0f3f017f3e prosody: updated to v0.9.5 2014-10-15 04:11:24 +02:00