Viacheslav Lotsmanov
9cf9f71b9e
Add “json2yaml” to top-level
...
(cherry picked from commit a863d6d8b18dde419bbc99b0a1b794c18172fdfb)
2021-07-14 16:08:17 +03:00
github-actions[bot]
bb5465316f
Merge staging-next-21.05 into staging-21.05
2021-07-14 12:03:14 +00:00
github-actions[bot]
212ea57f9e
Merge release-21.05 into staging-next-21.05
2021-07-14 12:02:37 +00:00
upkeep-bot
1672da0dfd
vscodium: 1.58.0 -> 1.58.1
...
(cherry picked from commit de51394821f6da571554d9470fb1e3c2b7460f20)
2021-07-14 20:47:57 +09:00
Maximilian Bosch
fc9369b884
Merge pull request #130137 from NixOS/backport-129570-to-release-21.05
...
[Backport release-21.05] matrix-synapse: 1.37.1 -> 1.38.0
2021-07-14 10:30:49 +02:00
Thomas Gerbet
07b2b092be
libsForQt5.kimageformats: fix CVE-2021-36083
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 3d260a2d0edffce5095a5f813e9227c4864e9715)
2021-07-14 10:08:43 +02:00
Sumner Evans
5b42238926
matrix-synapse: 1.37.1 -> 1.38.0
...
(cherry picked from commit 8b055178de78f9812b5625cf603ba0342194d40c)
2021-07-13 22:19:14 +00:00
github-actions[bot]
7cb1bc3204
Merge staging-next-21.05 into staging-21.05
2021-07-13 18:03:32 +00:00
github-actions[bot]
67f0be2d0f
Merge release-21.05 into staging-next-21.05
2021-07-13 18:02:56 +00:00
ajs124
2a96414d7e
Merge pull request #130108 from NixOS/backport-130086-to-release-21.05
...
[Backport release-21.05] icingaweb2: 2.8.2 -> 2.8.3
2021-07-13 18:21:47 +02:00
R. RyanTM
92080580a4
icingaweb2: 2.8.2 -> 2.8.3
...
(cherry picked from commit df3aa47c5af15512500aee0cd2872bf7bad72ac9)
2021-07-13 15:49:19 +00:00
Yureka
d36cd9e039
nixos/gitlab: improve psql assertion message
...
(cherry picked from commit c5a0551dc49b287d12d043298f9b7a4c8c355885)
2021-07-13 15:27:21 +02:00
Yureka
aff1607b17
gitlab: 14.0.2 -> 14.0.5
...
https://about.gitlab.com/releases/2021/07/06/gitlab-14-0-3-released/
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/
https://about.gitlab.com/releases/2021/07/08/gitlab-14-0-5-released/
(cherry picked from commit 6510a136119d9c24ba67e4133ab1d561f72a46f6)
2021-07-13 15:27:21 +02:00
Yureka
ebe13e59aa
gitlab: 14.0.1 -> 14.0.2
...
https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/
(cherry picked from commit a023b6c4722663e8e481daf2e593eb917d8daec0)
2021-07-13 15:27:21 +02:00
Yureka
7b1021ce28
nixos/tests/gitlab: use postgresql 13
...
Since 21.05 still defaults to 11, we need to set this (as does every
user).
2021-07-13 15:27:21 +02:00
Yureka
e4deb36262
nixos/gitlab: require at least postgresql 12
...
(cherry picked from commit 2297eb35e5b92f657b85dfe4ee535e2323e360c1)
2021-07-13 15:27:21 +02:00
Yureka
e8e5b8a9bb
gitlab: 13.12.4 -> 14.0.1
...
https://about.gitlab.com/releases/2021/06/22/gitlab-14-0-released/
https://about.gitlab.com/releases/2021/06/24/gitlab-14-0-1-released/
(cherry picked from commit facd0c68cc139aabff157f0a5f8deba621ed2ba8)
2021-07-13 15:27:21 +02:00
sternenseemann
3ebb71b547
apostrophe: fix HTML export by referencing fira fonts from store
...
pandoc can embed fonts and stylesheets on export which apostrophe uses —
however it has hardcoded paths for the fonts which only work in the
flatpak version, so we need to substitute them.
(cherry picked from commit 4e1acab880f0c27741810754c237dfd50e9be5f8)
2021-07-13 14:42:24 +02:00
github-actions[bot]
281c472a87
Merge staging-next-21.05 into staging-21.05
2021-07-13 12:03:01 +00:00
github-actions[bot]
b4cec2daa8
Merge release-21.05 into staging-next-21.05
2021-07-13 12:02:22 +00:00
Robin Gloster
8b98eb8fd1
Merge pull request #130050 from Ma27/backport-nextcloud
...
[21.05] nextcloud: version updates
2021-07-13 03:00:46 -05:00
github-actions[bot]
9ed221b890
Merge staging-next-21.05 into staging-21.05
2021-07-13 00:02:58 +00:00
github-actions[bot]
a784de8a26
Merge release-21.05 into staging-next-21.05
2021-07-13 00:02:25 +00:00
Maximilian Bosch
f8b79de69e
nextcloud22: init at 22.0.0
...
Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987.
2021-07-12 23:27:57 +02:00
Maximilian Bosch
b58ae55e22
nextcloud19: 19.0.6 -> 19.0.13
...
This basically has two reasons:
* I forgot to remove v19 here and I don't want to break this now. Going
up to the most recent patch-level is the least we can do.
* With a changed version, the `permittedInsecurePackages`-setting in
people's deployments has to change, so people will actually notice the
EOL of v19.
2021-07-12 23:14:59 +02:00
Maximilian Bosch
edfe11b535
nextcloud19: make it clear that it's EOL
...
I actually wanted to remove it before 21.05, but unfortunately I forgot
about this. This is a less drastic way of getting rid of v19 in contrast
to the actual breaking change in master[1].
[1] b922990a8eb4dbee8f9e7428572d2230a86c2a55
2021-07-12 23:12:19 +02:00
Maximilian Bosch
50fb3a1eeb
nextcloud20: 20.0.7 -> 20.0.11
...
ChangeLog: https://nextcloud.com/changelog/#20-0-11
(cherry picked from commit d45672d059cbcc106c3d3d52e4a185859b6c6635)
2021-07-12 21:53:34 +02:00
Benno Bielmeier
6856ce6a4a
nextcloud: 21.0.2 -> 21.0.3
...
(cherry picked from commit 765c1b314412b5073818c8b981117325da46a865)
2021-07-12 21:53:34 +02:00
upkeep-bot
a7512bb64b
vscodium: 1.57.1 -> 1.58.0
...
(cherry picked from commit 2201e7d8ce73625b65b481feeea7b62cac7f970b)
2021-07-13 04:13:06 +09:00
upkeep-bot
e2f293ddf6
vscodium: 1.57.0 -> 1.57.1
...
(cherry picked from commit 955df64c44eee780c71fd4da5bcabda553c94f7a)
2021-07-13 04:13:06 +09:00
upkeep-bot
cc6ae106aa
vscodium: 1.56.2 -> 1.57.0
...
(cherry picked from commit 39fd960ee100ffc63d53c40d65d081a3c18af3fe)
2021-07-13 04:13:06 +09:00
github-actions[bot]
0dc09a8693
Merge staging-next-21.05 into staging-21.05
2021-07-12 12:03:17 +00:00
github-actions[bot]
f3b0b41bd0
Merge release-21.05 into staging-next-21.05
2021-07-12 12:02:42 +00:00
Linus Heckemann
92802efe42
Merge pull request #130000 from Ma27/backport-wlroots
...
[21.05] wlroots: 0.14.0 -> 0.14.1
2021-07-12 10:43:02 +02:00
Michael Weiss
46667847c0
wlroots: 0.14.0 -> 0.14.1
...
(cherry picked from commit 7632ba310eb4fcb249abbaf67c4094afafd17c18)
2021-07-12 10:11:43 +02:00
github-actions[bot]
ed7a470f93
Merge staging-next-21.05 into staging-21.05
2021-07-12 06:06:34 +00:00
github-actions[bot]
b9fbdb6b8f
Merge release-21.05 into staging-next-21.05
2021-07-12 06:03:29 +00:00
Dmitry Kalinkin
07909ad7f4
blender: 2.93.0 -> 2.93.1
...
(cherry picked from commit 520c2971d1da6936c706138bdbe6b339f888d1c7)
2021-07-11 21:13:38 -04:00
github-actions[bot]
acdd2da56e
Merge staging-next-21.05 into staging-21.05
2021-07-12 00:03:17 +00:00
github-actions[bot]
cd1654a4ee
Merge release-21.05 into staging-next-21.05
2021-07-12 00:02:36 +00:00
Martin Weinelt
79d92ab090
Merge pull request #129778 from NixOS/staging-next-21.05
2021-07-11 23:41:19 +02:00
ajs124
a18e883c9b
Merge pull request #127730 from NixOS/backport-127705-to-release-21.05
...
[Backport release-21.05] nginxModules.rtmp: 1.2.1 -> 1.2.2
2021-07-11 22:25:09 +02:00
github-actions[bot]
8c2dd05bac
Merge staging-next-21.05 into staging-21.05
2021-07-11 18:08:39 +00:00
github-actions[bot]
597a6aad6d
Merge release-21.05 into staging-next-21.05
2021-07-11 18:03:22 +00:00
Gabriel Ebner
f130eb0777
Merge pull request #129944 from NixOS/backport-129223-to-release-21.05
...
[Backport release-21.05] ccls: set resource directory
2021-07-11 18:18:50 +02:00
Gabriel Ebner
7f255c6b23
ccls: set resource directory
...
Fixes #126936
(cherry picked from commit db37a86453abb88c8b35924a9392f31a936597d0)
2021-07-11 14:44:40 +00:00
github-actions[bot]
842f4277ee
Merge staging-next-21.05 into staging-21.05
2021-07-10 18:02:47 +00:00
github-actions[bot]
c1f5dd7be2
Merge release-21.05 into staging-next-21.05
2021-07-10 18:02:00 +00:00
Mario Rodas
ee7d443869
Merge pull request #129814 from NixOS/backport-128936-to-staging-21.05
...
[Backport staging-21.05] pythonPackages.pillow: 8.2.0 -> 8.3.1
2021-07-10 08:42:54 -05:00
markuskowa
cf59fbd539
Merge pull request #129842 from NixOS/backport-129839-to-release-21.05
...
[Backport release-21.05] linuxptp: 3.1 -> 3.1.1
2021-07-10 14:18:49 +02:00
