Commit Graph

14472 Commits

Author SHA1 Message Date
github-actions[bot] 0a354b4c0c
Merge release-21.05 into staging-next-21.05 2021-09-13 12:02:22 +00:00
Vladimír Čunát 9a3277af47
Merge #132287: jetty: 9.4.41.v20210516 -> 9.4.43.v20210629
...into release-21.05
2021-09-13 10:53:15 +02:00
github-actions[bot] 6a4d524347
Merge staging-next-21.05 into staging-21.05 2021-09-12 18:02:51 +00:00
Maximilian Bosch caef9da135 wiki-js: 2.5.201 -> 2.5.214
ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.214
(cherry picked from commit 75eaccdcbc79f908902638bbea4aef33ebdad712)
2021-09-12 12:51:18 +00:00
github-actions[bot] cc6415fd63
Merge staging-next-21.05 into staging-21.05 2021-09-10 12:03:08 +00:00
Vladimír Čunát 7e6d1241ef
knot-dns: 3.0.8 -> 3.0.9
(NixPkgs master is on 3.1.x already.)
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.9
2021-09-09 19:59:55 +02:00
github-actions[bot] 65cae77e59
Merge staging-next-21.05 into staging-21.05 2021-09-09 00:03:58 +00:00
R. RyanTM 168f530891 grocy: 3.1.0 -> 3.1.1
(cherry picked from commit e52facaf7575ce3e520b8081523cad96e6fd36a1)
2021-09-08 21:51:00 +02:00
github-actions[bot] 7e76877332
Merge staging-next-21.05 into staging-21.05 2021-09-08 18:02:50 +00:00
Sumner Evans 6ec23d9f3e matrix-synapse: 1.41.1 -> 1.42.0
(cherry picked from commit 8c6e887e750ed2c184e6018a8c3504124a09b1b3)
2021-09-08 09:09:35 +00:00
Thomas Gerbet 476832f9ba mosquitto: 2.0.11 -> 2.0.12
https://github.com/eclipse/mosquitto/blob/v2.0.12/ChangeLog.txt
(cherry picked from commit d4c75580c18c78bdf81810dc73aab76e10754190)
2021-09-02 10:56:25 +02:00
Thomas Gerbet 24caf232b7 mosquitto: 2.0.10 -> 2.0.11
Fixes CVE-2021-34431.

https://github.com/eclipse/mosquitto/blob/v2.0.11/ChangeLog.txt
(cherry picked from commit ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe)
2021-09-02 10:56:21 +02:00
Pascal Bach 110a2c9ebb
Merge pull request #136268 from NixOS/backport-135929-to-release-21.05
[Backport release-21.05] nextcloud22: 22.1.0 -> 22.1.1
2021-09-01 09:24:39 +02:00
Mario Rodas 1b7893c31a postgresql_13: 13.3 -> 13.4
https://www.postgresql.org/docs/release/13.4/
(cherry picked from commit 3290dd08a210653cb505de997d244d498ce71178)
2021-09-01 04:20:00 +00:00
Mario Rodas d04c1e30be postgresql_12: 12.7 -> 12.8
https://www.postgresql.org/docs/release/12.8/
(cherry picked from commit 677b27c24ee49f548c5593c7938917824bf1f806)
2021-09-01 04:20:00 +00:00
Mario Rodas 1f3805f7bb postgresql_11: 11.12 -> 11.13
https://www.postgresql.org/docs/release/11.13/
(cherry picked from commit 34418e4c2a23a2a461b0b3666a6088040b5962e8)
2021-09-01 04:20:00 +00:00
Mario Rodas 44a33d44a6 postgresql_10: 10.17 -> 10.18
https://www.postgresql.org/docs/release/10.18/
(cherry picked from commit 4c5bf33b5d01bf3524cd96ddcbe6d40787f66de7)
2021-09-01 04:20:00 +00:00
Mario Rodas 297d8d1547 postgresql_9_6: 9.6.22 -> 9.6.23
https://www.postgresql.org/docs/release/9.6.23/
(cherry picked from commit 957a9bd035a9d1a032a2c881b75b42626e16a0f6)
2021-09-01 04:20:00 +00:00
Robin Townsend 5b68d15c08 matrix-synapse: 1.41.0 -> 1.41.1
https://github.com/matrix-org/synapse/releases/tag/v1.41.1
(cherry picked from commit 5947c5989979c684d97f7154695e77e2000afbb7)
2021-08-31 14:50:37 +00:00
Maximilian Bosch 46d36e4abf nextcloud22: 22.1.0 -> 22.1.1
Changes: https://github.com/nextcloud/server/compare/v22.1.0...v22.1.1
(cherry picked from commit 690712624175de2f5856fcdcf43681792410e609)
2021-08-31 07:34:47 +00:00
Maxine Aubrey 773661d5ea
consul: 1.9.8 -> 1.9.9
- https://github.com/hashicorp/consul/releases/tag/v1.9.9
2021-08-30 19:55:58 +02:00
Robert Scott 6a01d735d9 icinga2: 2.12.4 -> 2.12.6 2021-08-25 21:39:25 +01:00
Maximilian Bosch bc1a0f5681
Merge pull request #135595 from NixOS/backport-134671-to-release-21.05
[Backport release-21.05] matrix-synapse: 1.40.0 -> 1.41.0
2021-08-25 10:28:02 +02:00
Maximilian Bosch ba6124b621
Merge pull request #135591 from Ma27/fix-mautrix-telegram
[21.05] mautrix-telegram: fix crash
2021-08-25 00:22:07 +02:00
Sumner Evans 7da0e25749 matrix-synapse: 1.40.0 -> 1.41.0
(cherry picked from commit 2f1030b3ade598afa5594bb519b49216561bbd10)
2021-08-24 20:36:45 +00:00
Maximilian Bosch 4aa2488fd1
mautrix-telegram: fix crash
The previous backport of `mautrix-telegram`[1] appears to be a mistake
of mine (sorry for that!), unfortunately v0.9 isn't forward-compatible
due to a database migration, so this change can't be reversed.

The primary issue was that `telethon` was too old, so I decided to
upgrade it to 1.21 which is what I had on my 21.05-based tracking
branch while using `mautrix-telegram` anyways, so that's proven to work.

Closes #135583

[1] e1042038ac / cd84b8ad8b
2021-08-24 21:28:15 +02:00
Maximilian Bosch 9001cc3080
Merge pull request #134344 from NixOS/backport-132559-to-release-21.05
[Backport release-21.05] matrix-synapse: 1.39.0 -> 1.40.0
2021-08-24 19:02:50 +02:00
Martin Weinelt a4463ff45c
Merge pull request #134222 from NixOS/backport-117235-to-release-21.05 2021-08-24 15:10:53 +02:00
Maximilian Güntner e9d616380b
matrix-synapse: override twisted 20.3.0 -> 21.7.0
see upstream issues:

https://github.com/twisted/twisted/pull/1225#issuecomment-788560006
https://github.com/matrix-org/synapse/issues/6211
2021-08-22 16:46:45 +02:00
Robert Scott 0be4a28183
Merge pull request #135001 from jasonrm/backport/134767-to-21.05
[21.05] mysql80: fix build on darwin
2021-08-21 23:22:06 +01:00
Maximilian Bosch b86db7692f
Merge pull request #134933 from Ma27/backport-mautrix-telegram
[21.05] mautrix telegram: 0.10.0 -> 0.10.1
2021-08-21 00:06:56 +02:00
Jason R. McNeil 698d69b2f5 mysql80: fix build on darwin
sw_vers is called during build since 8.0.26

- 83b87ae7f8

Fixes #132288

(cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37)
2021-08-20 13:59:15 -07:00
Maximilian Bosch 05e5b69ac8
mautrix-telegram: override mautrix to version 0.10.4
This is needed since 0.10.1 of mautrix-telegram, but it'd be a breaking
change of mautrix, which can be used for any kind of matrix client, so I
don't really want to break it.
2021-08-20 11:17:04 +02:00
Maximilian Bosch e1042038ac
mautrix-telegram: 2021-08-12 -> 0.10.1
ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1
(cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc)
2021-08-20 11:10:53 +02:00
Fabian Affolter cd84b8ad8b
mautrix-telegram: 0.10.0 -> unstable-2021-08-12
(cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f)
2021-08-20 11:10:49 +02:00
Ryan Mulligan 6feba8ac10 discourseAllPlugins: init discourse-ldap-auth
(cherry picked from commit 70d29c5cf4c0561b22f8934db0c5b2dd1bf6484c)
2021-08-19 13:32:24 +00:00
talyz 18902d1e12
discourse: update.py: Remove native platforms in plugin lock files..
...and add ruby.

(cherry picked from commit 12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4)
2021-08-17 23:16:54 +02:00
talyz ba5434c984
discourse.mkDiscoursePlugin: Handle repos with `gems` directories
Some plugin repos already have a `gems` directory. This lets the
packager choose whether it should be kept and the nix packaged ruby
gems should be copied into it or if it should be removed in favor of
our ruby gems.

(cherry picked from commit 04e6b03fa91603c7f1961cfcdcf5880c91fe6b05)
2021-08-17 23:16:47 +02:00
talyz fd169abf9b
discourse.plugins: Make the updater able to package plugins
Let the update.py script handle the initial, repetitive task of
packaging new plugins. With this in place, the plugin only needs to be
added to the list in `update-plugins` and most of the work will be
done automatically when the script is run. Metadata still needs to be
filled in manually and some packages may of course require additional
work/patching.

(cherry picked from commit f8096460bd15d4f13a01cfddf0a30798921fdb42)
2021-08-17 23:16:41 +02:00
talyz 08fde82d77
discourse.plugins.discourse-github: Update
(cherry picked from commit 4197b6dd146c395f1caec3b086334a2b0eff623a)
2021-08-17 23:16:34 +02:00
talyz af15cbe6b0
discourse: Change the path to the auto generated plugin assets
Change the path to the auto generated plugin assets, which defaults to
the plugin's directory and isn't writable at the time of asset
generation.

(cherry picked from commit 443b318ee9c614d480a2ecb0120b52806d6fbb3b)
2021-08-17 23:16:28 +02:00
talyz 080e4e43fb
discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.

(cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
2021-08-17 23:16:18 +02:00
talyz 639e1d9639
discourse: Remove leftover link to unused plugins directory
(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c)
2021-08-17 23:13:55 +02:00
talyz 202c17a806
discourse.plugins.discourse-data-explorer: Update
(cherry picked from commit 6f2652735817e22c55de3b6e137faf7cdbc3fd2a)
2021-08-17 23:13:49 +02:00
talyz 700cfb0fc3
discourse.plugins.discourse-solved: Update
(cherry picked from commit 92b758266e61b2efe078973a3d020b3d1a2c363d)
2021-08-17 23:13:43 +02:00
talyz fddb277d03
discourse.plugins.discourse-canned-replies: Update
(cherry picked from commit 5d94e3bfc94637f6876b9957471fc571646867b0)
2021-08-17 23:13:36 +02:00
talyz 4a30a10e62
discourse.plugins.discourse-calendar: Update
(cherry picked from commit d1a63bf19c6c75430393dab94f5e939b258ffdb6)
2021-08-17 23:13:30 +02:00
talyz f2533d47c8
discourse: 2.7.5 -> 2.7.7
(cherry picked from commit c97ae4ad8e782765b333840d8d1aa83903f82b7f)
2021-08-17 23:13:23 +02:00
Felix Buehler c193cf6ed9
discourse.mkDiscoursePlugin: remove phases
(cherry picked from commit 4f62b051375b0fdaa01ba37e915cfaaa7de40d80)
2021-08-17 23:12:50 +02:00
Ryan Mulligan 8b8ccc0fd8
discourseAllPlugins: add discourse-calendar
(cherry picked from commit 858b0157e56426ee0d56faae393fc85b361ffd90)
2021-08-17 23:12:44 +02:00