Commit Graph

9181 Commits

Author SHA1 Message Date
Frederik Rietdijk
419bc0a4cd Revert "Revert "Merge master into staging-next""
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
2020-02-05 19:41:25 +01:00
Frederik Rietdijk
0be87c7979 Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.

This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
2020-02-05 19:18:35 +01:00
Frederik Rietdijk
87a19e9048
Merge pull request #79119 from NixOS/staging-next
Staging next
2020-02-05 19:09:27 +01:00
Vladimír Čunát
baeed035ea
Merge #78628: knot-resolver: 4.3.0 -> 5.0.1
The service needed lots of changes. A few smaller changes
are added into the PR, e.g. replacement for PR #72014.
See the commit messages for details.
2020-02-05 16:57:02 +01:00
Vladimír Čunát
e3edb004c6
knot-resolver: 5.0.0 -> 5.0.1
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v5.0.1
2020-02-05 16:53:40 +01:00
Maximilian Bosch
696829ff69
documize-community: 3.6.0 -> 3.7.0
https://github.com/documize/community/releases/tag/v3.7.0
2020-02-05 16:37:19 +01:00
Frederik Rietdijk
76a439239e Merge master into staging-next 2020-02-05 10:28:52 +01:00
Emily
6d046e1079 openresty: rebase on top of nginx package
The primary motivation of this change was to allow third-party modules
to be used with OpenResty, but it also results in a significant
reduction of code duplication.
2020-02-04 19:30:40 -06:00
Emily
db3182a65d nginxModules.brotli: v0.1.2 -> unstable
The fork was merged back upstream but has yet to see a formal release.
2020-02-04 19:30:40 -06:00
Maximilian Bosch
89d13541e5
mautrix-telegram: 0.7.0 -> 0.7.1
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.1
2020-02-04 22:28:15 +01:00
Alyssa Ross
95de02942f
Revert "mailman-wrapper: crazy hack to work around the missing urllib3 dependency"
This reverts commit ce6b2419be, which
was unnecessary (mailman worked just fine on its parent commit).

See #79222.
2020-02-04 15:40:37 +00:00
Peter Simons
ce6b2419be mailman-wrapper: crazy hack to work around the missing urllib3 dependency
Please remove the explicit urllib3 dependency from this expression again once
https://github.com/NixOS/nixpkgs/issues/79222 is fixed.
2020-02-04 14:43:56 +01:00
Peter Simons
5717f312a4 mailman-web: add myself as a maintainer 2020-02-04 14:43:46 +01:00
Aaron Andersen
0285cbcbe2
Merge pull request #79159 from jojosch/mytop-clear
mariadb: mytop add "clear" to PATH
2020-02-04 08:00:55 -05:00
Will Dietz
500f032729
Merge pull request #78185 from dtzWill/update/nginx-1.17.8
nginxMainline: 1.17.3 -> 1.17.8
2020-02-03 17:35:42 -06:00
Johannes Schleifenbaum
39ebcc496f
mariadb: mytop add "clear" to PATH
The following error was printed every second:

    Can't exec "clear": Not a directory at /nix/store/.../bin/.mytop-wrapped line 110.
    Use of uninitialized value $CLEAR in string at /nix/store/.../bin/.mytop-wrapped line 781.

Therefore the mytop output was repeatedly displayed instead of updating itself "in-place".
2020-02-03 15:48:18 +01:00
Peter Hoeg
f8c5513ce1
Merge pull request #78734 from Mic92/appdaemon
appdaemon: 3.0.5 -> 4.0.1
2020-02-03 22:00:38 +08:00
Maximilian Bosch
5c2a7d0f07
Merge pull request #79015 from mayflower/pkg/prometheus-xmpp-alerts
prometheus-xmpp-alerts: init at 0.4.2
2020-02-02 18:46:53 +01:00
Frederik Rietdijk
c195ef6aab
Merge pull request #78928 from NixOS/staging-next
Staging next
2020-02-02 15:35:18 +01:00
Frederik Rietdijk
e4c28f78e7 Merge staging-next into staging 2020-02-02 15:33:13 +01:00
Janne Heß
7dadbc7a98 confluence: Add support for MySQL driver
If Confluence should be connected to a MySQL database, the JDBC driver
is required.
Also switch to stdenvNoCC, because we don't really use cc.
2020-02-01 19:32:15 +01:00
Franz Pletz
c4f30cc14d
Merge pull request #78984 from marsam/update-endlessh
endlessh: 1.0 -> 1.1
2020-02-01 14:36:01 +00:00
Franz Pletz
add880c5e8
prometheus-xmpp-alerts: init at 0.4.2 2020-02-01 15:04:01 +01:00
Franz Pletz
e8b8e8c615
rspamd: 1.9.4 -> 2.2 2020-02-01 14:20:51 +01:00
Franz Pletz
4d5d5ed62d
rmilter: remove unused files
The merge 98640fd482 was done incorrectly.
2020-02-01 13:38:22 +01:00
Mario Rodas
ea6fcc0e1f
Merge pull request #78977 from r-ryantm/auto-update/hylafaxplus
hylafaxplus: 7.0.1 -> 7.0.2
2020-02-01 04:29:24 -05:00
R. RyanTM
dd0efcdb0b hylafaxplus: 7.0.1 -> 7.0.2 2020-02-01 02:02:09 +00:00
Daiderd Jordan
b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides
We _do_ want minimum versions in our packages.
2020-01-31 21:52:12 +01:00
Daiderd Jordan
9b579843d4
treewide: use stdenv.macosVersionMin 2020-01-31 21:52:12 +01:00
Mario Rodas
ce1ad7654b
endlessh: 1.0 -> 1.1
https://github.com/skeeto/endlessh/releases/tag/1.1
2020-01-31 12:00:00 -05:00
Vladimír Čunát
ae74a0e27c
(nixos/)knot-resolver: 4.3.0 -> 5.0.0
Minor incompatibilities due to moving to upstream defaults:
  - capabilities are used instead of systemd.socket units
  - the control socket moved:
    /run/kresd/control -> /run/knot-resolver/control/1
  - cacheDir moved and isn't configurable anymore
  - different user+group names, without static IDs

Thanks Mic92 for multiple ideas.
2020-01-31 15:22:52 +01:00
Vladimír Čunát
93ad21dedd
knot-resolver: remove older lua path workarounds
Part of this is approximate revert of commit f0d2da43a7.
2020-01-31 15:06:20 +01:00
Aaron Andersen
609699bc95 zabbix: 4.4.4 -> 4.4.5 2020-01-30 21:56:29 -08:00
Aaron Andersen
768154aaed zabbix: 4.0.16 -> 4.0.17 2020-01-30 21:56:29 -08:00
Frederik Rietdijk
5cc0468a20 Merge staging into staging-next 2020-01-31 00:16:31 +01:00
Alyssa Ross
881dd9963f mailman-web: use upstream, improve NixOS module
Previously, some files were copied into the Nixpkgs tree, which meant
we wouldn't easily be able to update them, and was also just messy.

The reason it was done that way before was so that a few NixOS
options could be substituted in.  Some problems with doing it this way
were that the _package_ changed depending on the values of the
settings, which is pretty strange, and also that it only allowed those
few settings to be set.

In the new model, mailman-web is a usable package without needing to
override, and I've implemented the NixOS options in a much more
flexible way.  NixOS' mailman-web config file first reads the
mailman-web settings to use as defaults, but then it loads another
configuration file generated from the new services.mailman.webSettings
option, so _any_ mailman-web Django setting can be customised by the
user, rather than just the three that were supported before.  I've
kept the old options, but there might not really be any good reason to
keep them.
2020-01-30 23:14:45 +00:00
Alyssa Ross
a8538a73a7 mailman: init package for Mailman CLI
We already had python3Packages.mailman, but that's only really usable
as a library.  The only other option was to create a whole Python
environment, which was undesirable to install as a system-wide
package.
2020-01-30 23:14:45 +00:00
Alyssa Ross
bc8eece849 python3.pkgs.mailman-hyperkitty: HTTPS homepage 2020-01-30 23:14:45 +00:00
Alyssa Ross
c397d1909f nixos/mailman: don't keep secrets in the Nix store
This replaces all Mailman secrets with ones that are generated the
first time the service is run.  This replaces the hyperkittyApiKey
option, which would lead to a secret in the world-readable store.
Even worse were the secrets hard-coded into mailman-web, which are not
just world-readable, but identical for all users!

services.mailman.hyperkittyApiKey has been removed, and so can no
longer be used to determine whether to enable Hyperkitty.  In its
place, there is a new option, services.mailman.hyperkitty.enable.  For
consistency, services.mailman.hyperkittyBaseUrl has been renamed to
services.mailman.hyperkitty.baseUrl.
2020-01-30 23:14:45 +00:00
Michael Raskin
4297d4b017
Merge pull request #78854 from r-ryantm/auto-update/squid
squid: 4.9 -> 4.10
2020-01-30 20:24:49 +00:00
Vladimír Čunát
e980e7a3ab
knot-resolver: enable checks on aarch64
The cqueues fix is in nixpkgs already, so it works now.
2020-01-30 18:48:57 +01:00
Ryan Mulligan
cead3c7cca
Merge pull request #78870 from r-ryantm/auto-update/uftp
uftp: 4.10 -> 4.10.1
2020-01-30 09:16:49 -08:00
R. RyanTM
8bbe9bbfe8 uftp: 4.10 -> 4.10.1 2020-01-30 15:59:11 +00:00
Silvan Mosberger
2118cddc82
nixos/freeswitch: init (#76821)
nixos/freeswitch: init
2020-01-30 16:45:47 +01:00
Jörg Thalheim
4358dfff8d
appdaemon: 3.0.5 -> 4.0.1 2020-01-30 14:00:40 +00:00
R. RyanTM
8cf32a28fb squid: 4.9 -> 4.10 2020-01-30 13:59:46 +00:00
Silvan Mosberger
32718c9992
VictoriaMetrics: init at v1.32.5, add module, tests (#78038)
VictoriaMetrics: init at v1.32.5, add module, tests
2020-01-30 14:02:42 +01:00
Mario Rodas
9f53b1bd6a
Merge pull request #77903 from r-ryantm/auto-update/seyren
seyren: 1.1.0 -> 1.5.0
2020-01-29 21:53:51 -05:00
Mario Rodas
4b78574350
Merge pull request #78518 from r-ryantm/auto-update/mtprotoproxy
mtprotoproxy: 1.0.8 -> 1.0.9
2020-01-29 21:44:47 -05:00
Alyssa Ross
85a9743f13 spamassassin: use /etc/mail/spamassassin for config
Using a custom path in the Nix store meant that users of the module
couldn't add their own config files, which is a desirable feature.  I
don't think avoiding /etc buys us anything.
2020-01-30 00:47:10 +00:00