Commit graph

138 commits

Author SHA1 Message Date
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
Felix Buehler
c112713bcf ejabberd: remove phases 2021-07-22 00:27:01 +02:00
Jörg Thalheim
9b24799b11
Merge pull request from Izorkin/update-ejabberd
ejabberd: 20.12 -> 21.04
2021-07-01 08:12:37 +01:00
Jörg Thalheim
6a04b91a98
ejabberd: drop riak support
riak project is dead.
2021-07-01 09:10:36 +02:00
Jörg Thalheim
82973506ac
ejabberd: drop broken elixir support 2021-07-01 09:10:11 +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
Izorkin
f04448c805
ejabberd: 20.12 -> 21.04 2021-05-11 14:22:13 +03:00
Sandro Jäckel
05aff5f842
biboumi: format, remove unused input 2021-03-08 02:01:13 +01: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
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Julien Moutinho
a98ed9ee68 biboumi: 8.5 -> 9.0 2021-02-25 06:25:56 -05:00
Jörg Thalheim
819873f29e
python3.pkgs.xmpppy: remove + dependent packages 2021-02-22 05:43:13 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
ajs124
2fcf614ea3 ejabberd: remove myself as maintainer 2021-01-27 17:10:34 +01:00
Jörg Thalheim
c9c0ef0e35
ejabberd: 20.03 -> 20.12 2021-01-27 10:54:25 +01:00
zowoq
31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of 

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
872973d7d1 pkgs/servers: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05: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
Félix Baylac-Jacqué
09c383c17a
Merge pull request from ju1m/biboumi
nixos/biboumi: init
2020-09-02 17:43:27 +02:00
Julien Moutinho
f333296776 nixos/biboumi: init 2020-09-02 08:31:53 +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
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) ()
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 from Izorkin/ejabberd
ejabberd: 18.06 -> 18.12.1
2019-01-24 00:57:54 +01:00