293754 Commits

Author SHA1 Message Date
github-actions[bot]
0744732cab
Merge staging-next-21.05 into staging-21.05 2021-07-27 00:03:15 +00:00
github-actions[bot]
17caed6521
Merge release-21.05 into staging-next-21.05 2021-07-27 00:02:38 +00:00
Martin Weinelt
35eedec9c2
Merge pull request #131584 from NixOS/backport-131484-to-release-21.05
[Backport release-21.05] Kernels 2021-07-25
2021-07-27 00:26:37 +02:00
Robert Scott
8d894f90d4 varnish62, varnish63: add patch for CVE-2021-36740 2021-07-26 22:19:15 +01:00
Robert Scott
88e99266e6 varnish60: 6.0.7 -> 6.0.8 2021-07-26 22:19:15 +01:00
Alyssa Ross
93ab0e3fcd apk-tools: 2.12.5 -> 2.12.6
Fixes: CVE-2021-36159
(cherry picked from commit 29475a58af1d46e48017416aba9ffbead9bf1a91)
2021-07-26 20:42:10 +00:00
github-actions[bot]
89c0dff795
Merge staging-next-21.05 into staging-21.05 2021-07-26 18:03:01 +00:00
github-actions[bot]
a5e3dc56f3
Merge release-21.05 into staging-next-21.05 2021-07-26 18:02:28 +00:00
Sander van der Burg
438263cb11
Merge pull request #131586 from svanderburg/backport-eduke32
[Backport release-21.05] eduke32: 20200907 -> 20210722
2021-07-26 19:53:01 +02:00
Martin Weinelt
d952d009b0
Merge pull request #131231 from NixOS/backport-130547-to-staging-21.05
[Backport staging-21.05] imagemagick: 7.1.0-2 -> 7.1.0-4
2021-07-26 18:36:14 +02:00
Martin Weinelt
066cc148f3
Merge pull request #131568 from NixOS/backport-131560-to-release-21.05
[Backport release-21.05] feh: 3.7 -> 3.7.1
2021-07-26 18:30:03 +02:00
TredwellGit
8b60c185fa linux_latest-libre: 18165 -> 18191
(cherry picked from commit 2004b7b08dc1d96a5603d3138545865c036a6081)
2021-07-26 15:47:29 +00:00
TredwellGit
2f7a5aa75a linux-rt_5_10: 5.10.47-rt46 -> 5.10.52-rt47
(cherry picked from commit ee688c5c0e5c5a08f292308f1c41be84604c7e43)
2021-07-26 15:47:29 +00:00
TredwellGit
92566fadc9 linux: 5.13.4 -> 5.13.5
(cherry picked from commit 286fa7b708fa932a6955b796628486c13f5fee24)
2021-07-26 15:47:28 +00:00
Sander van der Burg
6da1f11195 eduke32: 20200907 -> 20210722
(cherry picked from commit 94ac68c879f4b172ade9cd7fabca1b9ed85bcdd1)
2021-07-26 16:58:31 +02:00
R. RyanTM
e1489da3b2 hydroxide: 0.2.18 -> 0.2.19
(cherry picked from commit 23e2cf23bcee0567e22a0f7dc0859f988cd7e500)
2021-07-26 12:58:24 +00:00
github-actions[bot]
32d47b2571
Merge staging-next-21.05 into staging-21.05 2021-07-26 12:03:04 +00:00
github-actions[bot]
c0e47b56a6
Merge release-21.05 into staging-next-21.05 2021-07-26 12:02:32 +00:00
R. RyanTM
bfd24c0bd8 feh: 3.7 -> 3.7.1
(cherry picked from commit 1493f098f819530d60f5d226dbf6a0308098833d)
2021-07-26 10:46:14 +00:00
Martin Weinelt
c8569c32ba
Merge pull request #131546 from taku0/firefox-bin-90.0.2_release-21.05 2021-07-26 11:56:15 +02:00
Maximilian Bosch
91903ceb29
Merge pull request #131256 from NixOS/backport-131188-to-release-21.05
[Backport release-21.05] prometheus-openldap-exporter: 2.1 -> 2.1.4
2021-07-26 09:21:28 +02:00
Maximilian Bosch
e6c441a5dc
Merge pull request #131524 from NixOS/backport-131217-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.7.31 -> 1.7.33
2021-07-26 09:13:44 +02:00
Michael Weiss
4f6946867e
Merge pull request #131461 from primeos/chromium-backport
[21.05] chromium: 91.0.4472.164 -> 92.0.4515.107
2021-07-26 08:49:13 +02:00
github-actions[bot]
d3f7cf9de9
Merge staging-next-21.05 into staging-21.05 2021-07-26 06:03:30 +00:00
github-actions[bot]
0a98627383
Merge release-21.05 into staging-next-21.05 2021-07-26 06:02:57 +00:00
taku0
caf1219646 firefox: 90.0.1 -> 90.0.2
(cherry picked from commit 82feb1120172e0615e1f6f4dc517a69e8c6c03f6)
2021-07-26 14:08:16 +09:00
taku0
1096ca11df firefox-bin: 90.0.1 -> 90.0.2
(cherry picked from commit b14e3171773c1791b50dc19fa6d68cc285b11741)
2021-07-26 14:08:16 +09:00
taku0
633edf7793 firefox: 90.0 -> 90.0.1
(cherry picked from commit 1ad4db95fbf0841806e488371f825ddd696d4bfa)
2021-07-26 14:08:15 +09:00
taku0
b27e930fd2 firefox-bin: 90.0 -> 90.0.1
(cherry picked from commit 928c7dbb61504d717ed356b3c6d6d26154aeea24)
2021-07-26 14:08:15 +09:00
R. RyanTM
05309458ba erlangR23: 23.3.4.4 -> 23.3.4.5
(cherry picked from commit 53d45d04f5ba0e58bd6cc5dac23cb79f02d7a328)
2021-07-26 10:20:25 +09:00
github-actions[bot]
892702123d
Merge staging-next-21.05 into staging-21.05 2021-07-26 00:03:56 +00:00
github-actions[bot]
4c48e43d39
Merge release-21.05 into staging-next-21.05 2021-07-26 00:03:19 +00:00
Maximilian Bosch
0bf820521a element-desktop: try to fix localization issues
I know that the en_EN.json vs. en-us.json is a nasty hack, but I don't
really understand where this `en-us.json` is supposed to be coming from.

(cherry picked from commit b856b195409121457e7c52ad8177dc73a15c423c)
2021-07-25 22:32:51 +00:00
Maximilian Bosch
a955535eae element-desktop: 1.7.31 -> 1.7.33
ChangeLogs:
* https://github.com/vector-im/element-desktop/releases/tag/v1.7.33
* https://github.com/vector-im/element-desktop/releases/tag/v1.7.32

(cherry picked from commit 07620c8697c4150ee71cfd26462d04666e781fbd)
2021-07-25 22:32:50 +00:00
Maximilian Bosch
ac90c8d510 element-web: 1.7.31 -> 1.7.33
ChangeLogs:
* https://github.com/vector-im/element-web/releases/tag/v1.7.33
* https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1
* https://github.com/vector-im/element-web/releases/tag/v1.7.32
* https://github.com/vector-im/element-web/releases/tag/v1.7.32-rc.1

(cherry picked from commit 040fabf509ed2a10098fee4a3244ff4f3daa1934)
2021-07-25 22:32:50 +00:00
Elis Hirwing
23098f2037
Merge pull request #131501 from NixOS/backport-131483-to-release-21.05
[Backport release-21.05] phpPackages.composer: 2.1.3 -> 2.1.5
2021-07-25 22:32:27 +02:00
Thomas Gerbet
8fea6a45a0 phpPackages.composer: 2.1.3 -> 2.1.5
https://github.com/composer/composer/releases/tag/2.1.4
https://github.com/composer/composer/releases/tag/2.1.5
(cherry picked from commit 8c59a77a04339beaced44b293db579c9aaa16aa0)
2021-07-25 18:21:48 +00:00
github-actions[bot]
e6ee5601f9
Merge staging-next-21.05 into staging-21.05 2021-07-25 18:03:16 +00:00
github-actions[bot]
0693039bd8
Merge release-21.05 into staging-next-21.05 2021-07-25 18:01:59 +00:00
adisbladis
ecd1adcea0
Merge pull request #130579 from NixOS/backport-127145-to-release-21.05
[Backport release-21.05] containerd: 1.5.1 -> 1.5.2
2021-07-25 12:43:16 -05:00
Robert Schütz
9317b77a1d imagemagick6: 6.9.12-17 -> 6.9.12-19
(cherry picked from commit 3bb091640bc7deb719759deab43cd2e206520b2a)
2021-07-25 16:31:55 +02:00
OPNA2608
f6f4c4ac26 soundtracker: Fix on Darwin
(cherry picked from commit ade48138df8b77c1d76f4b5f016be5ebee06565e)
2021-07-25 13:37:25 +00:00
Francesco Gazzetta
9cd2c7a627 soundtracker: 1.0.1 -> 1.0.2.1
(cherry picked from commit 7cc5590b9236a62ba53b92e36a06f1c61b4ef682)
2021-07-25 13:37:25 +00:00
Luke Granger-Brown
cf2e6fa8dd
Merge pull request #131456 from NixOS/backport-125946-to-release-21.05
[Backport release-21.05] docker: 20.10.6 -> 20.10.7
2021-07-25 14:02:24 +01:00
Ryan Mulligan
807a22965a
Merge pull request #130303 from NixOS/backport-128633-to-release-21.05
[Backport release-21.05] discord: fix updater script
2021-07-25 05:57:33 -07:00
github-actions[bot]
48b0dbb885
Merge staging-next-21.05 into staging-21.05 2021-07-25 12:02:56 +00:00
github-actions[bot]
46a3e2b42d
Merge release-21.05 into staging-next-21.05 2021-07-25 12:02:20 +00:00
Michael Weiss
37eae1967a
Merge pull request #131363 from oxalica/fix/tdesktop-voice-chat-backport
[21.05] tdesktop: fix calls, dlopen and bundle fonts
2021-07-25 13:21:02 +02:00
Michael Weiss
4e8d55ce61
nixos/tests/chromium: Drop the workaround for Chrome GPU crashes
This regression was fixed by 51d83077ffb.

(cherry picked from commit 4ec2b24603e6eb4a48272678c75d2518de4e2191)
2021-07-25 13:04:53 +02:00
Michael Weiss
6dbb8d5098
nixos/tests/chromium: Check the version and that it's an official build
This also prints and screenshots the output of chrome://version which
contains useful information.

Outputs (stable, beta, ungoogled, chrome-stable, chrome-beta, chrome-dev):
Chromium	92.0.4515.107 (Official Build) (64-bit)
Chromium        92.0.4515.107 (Official Build) (64-bit)
Chromium        91.0.4472.164 (Official Build, ungoogled-chromium) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) beta (64-bit)
Google Chrome   93.0.4577.8 (Official Build) dev (64-bit)

(cherry picked from commit 7b3c0545149cb5c67611945d6022b61047439d61)
2021-07-25 13:04:52 +02:00