3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

108 commits

Author SHA1 Message Date
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
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01: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
Izorkin ef2eeb4d8f ejabberd: 20.01 -> 20.03 2020-03-30 07:42:26 +03:00
R. RyanTM 39224a7f4e ejabberd: 19.09.1 -> 20.01 2020-01-26 21:37:14 +00:00
ajs124 a216a37898 ejabberd: 19.08 -> 19.09.1 2019-12-03 22:18:51 +01: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
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Milan Pässler (work) 185fd61631 treewide: remove uses of doBuild and doConfigure
doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
2019-09-02 23:42:12 +02:00
Alexei Robyn 8c76de9b16 prosody: Update for Lua search path handling change 2019-09-01 17:42:20 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
ajs124 40b2fa6a10 ejabberd: 19.05 -> 19.08 2019-08-20 11:09:39 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00: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
Izorkin cecfd0652c ejabberd: 19.02 -> 19.05 2019-06-02 00:39:32 +03:00
Izorkin 86059b4f42 ejabberd: 18.12.1 -> 19.02 2019-02-27 16:25:12 +03:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00: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
Silvan Mosberger 7790dbe6a2
Merge pull request #53796 from Izorkin/ejabberd
ejabberd: 18.06 -> 18.12.1
2019-01-24 00:57:54 +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
Izorkin e680dd42b4 ejabberd: 18.06 -> 18.12.1 2019-01-11 12:00:27 +03: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
Markus Kowalewski d76c275605
pyIRCt,pyMAILt: add license 2018-11-15 00:13:52 +01:00
ajs124 8910795eee ejabberd: 18.01 -> 18.06 (#44158)
ejabberd switched from imagemagick to eimp, which loads libpng, libjpeg
and libwebp at runtime. These were therefore added as dependencies and
the relevant binary was wrapped to be able to find them.
2018-08-05 18:02:40 +02:00
ajs124 3d6e38234d biboumi: 7.2 -> 8.3
also update catch from 1.5.6 to 2.2.1
2018-07-27 19:56:17 +02: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
Ryan Mulligan 038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Matthew Bauer ce8ce600ae unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
2018-03-26 17:40:55 -05:00
Robin Gloster 76ea0e1b2e
Merge pull request #32960 from florianjacob/prosody-0.10
Prosody 0.10.0
2018-03-22 14:12:57 +01: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
Ryan Mulligan 848d597eab biboumi: 6.1 -> 7.2
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2/bin/biboumi --help` got 0 exit code
- found 7.2 with grep in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
- found 7.2 in filename of file in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
2018-03-07 18:25:56 -08:00
Nikolay Amiantov f22a050a1a ejabberd: 17.07 -> 18.01 2018-02-25 22:24:09 +03:00
John Ericson 888404f11b treewide: Fix deps in a few other fixed output derivations 2018-01-10 11:18:44 -05: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
Frank Doepper 916c0a69f8 biboumi: init at 6.1 (#30193)
* biboumi: init at 6.1

TODO: integrate config in NixOS

* biboumi: remove external buildtime dep

- fetch catch.hpp in a reproducible way
- add maintainer
- enable tests
- remove git dep
- enable parallel building
- add pandoc dep for man page
- nitpicks

* biboumi: refine substitutions

- only CMakeLists.txt has to be patched regarding /etc/biboumi
- substitute /bin/kill in systemd service file
- prepare for configuring policy_directory in a future cfg file
2017-10-20 20:14:41 +00:00
Nikolay Amiantov e9520bab01 ejabberd: 17.01 -> 17.07 2017-07-27 17:07:45 +03:00
rht 5628cebcf0 /bin/sh -> ${stdenv.shell} 2017-04-30 17:01:07 +02:00
uwap a616f4ec9b prosody: 0.9.10 -> 0.9.12 (#24269) 2017-03-25 20:14:12 +01:00
Nikolay Amiantov 37e2c5378f ejabberd: 16.09 -> 17.01 2017-01-31 03:26:25 +03:00
Michael Raskin 567c1a360f openfire: mark as broken; its unfriendlyness towards read-only installation directory and friendliness towards manual installation by just unpacking only grow with time 2017-01-04 19:36:43 +01:00
Nikolay Amiantov 3a05ea5376 ejabberd: 16.08 -> 16.09 2016-11-20 19:06:40 +03:00
Tuomas Tynkkynen f6640842fe treewide: Make explicit that 'dev' output of sqlite is used 2016-08-23 03:52:07 +03:00
Nikolay Amiantov 5524d29f1b ejabberd: 16.04 -> 16.08 2016-08-14 22:36:03 +03:00