294251 Commits

Author SHA1 Message Date
github-actions[bot]
cfef8879de
Merge release-21.05 into staging-next-21.05 2021-07-28 06:03:16 +00:00
ajs124
0562809586
Merge pull request #131698 from mweinelt/21.05/mysql
[21.05] mysql 8.0.22 -> 8.0.26
2021-07-28 02:24:17 +02:00
github-actions[bot]
dd8ba8e1d6
Merge staging-next-21.05 into staging-21.05 2021-07-28 00:03:16 +00:00
github-actions[bot]
cb0014146e
Merge release-21.05 into staging-next-21.05 2021-07-28 00:02:37 +00:00
Sander van der Burg
ed9f1dc5c0
Merge pull request #131727 from NixOS/backport-131593-to-release-21.05
[Backport release-21.05] ecwolf: init at 1.3.3
2021-07-27 23:14:13 +02:00
Jeremy Kolb
a8a7b26adb kernel: enable MOUSE_PS2_VMMOUSE
Turns VMware guest mouse support on in the kernel. This is needed for running Wayland and non-root X in a VMWare guest. In a pre-Wayland world the `xf86-input-vmmouse` userspace driver would have handled this for us. This allows the mouse to properly work in a vmware guest (for example it can now leave the vmware window).

See: https://github.com/vmware/open-vm-tools/issues/528
(cherry picked from commit 1207e7581f7bb863d0789c980930464d92d221cb)
2021-07-27 20:36:15 +00:00
Sander van der Burg
6992766507 ecwolf: init at 1.3.3
(cherry picked from commit de9913708c019a18adce74f6ecb143073fdbbec2)
2021-07-27 19:58:15 +00:00
github-actions[bot]
7b42f47d0b
Merge staging-next-21.05 into staging-21.05 2021-07-27 18:02:51 +00:00
github-actions[bot]
39ddb4745d
Merge release-21.05 into staging-next-21.05 2021-07-27 18:02:15 +00:00
Michael Francis
6526d0e5c3
Only include ipsecTools if using ipsec
(cherry picked from commit adc368d2fc7dd74beb8486ff72880ed0212abb0d)
2021-07-27 19:46:56 +02:00
Martin Weinelt
e3e90d53a8 mysql80: 8.0.25 -> 8.0.26
(cherry picked from commit c3c2ca1ba0faeb486a9a5059d95f4de72e6c39b7)
2021-07-27 17:24:45 +02:00
Giulio De Pasquale
457eb2fdb3 mysql 8.0.22 -> 8.0.25
(cherry picked from commit f6d3da9061a54576436906e201fa336f1fdda716)
2021-07-27 17:24:31 +02:00
Luke Granger-Brown
39a99c37d2
Merge pull request #131689 from rb2k/21_05_hg_fix
[Backport release-21.05] mercurial: use working patch links
2021-07-27 16:14:12 +01:00
Luke Granger-Brown
5ea98b810c mercurial: fix patch links again
The conclusion is that Phabricator does not, in fact, generate stable
patch links. In any case, these have landed, so we can just use the
patches from Mercurial's hgweb instance instead, which should be more
stable.

(cherry picked from commit 67444f8a393846b1431cfeb936e83a9f24725e2d)
2021-07-27 07:55:52 -07:00
Niklas Hambüchen
0a532d8b22
Merge pull request #128818 from NixOS/backport-128546-to-release-21.05
[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-07-27 16:18:00 +02:00
github-actions[bot]
d97a9acfd6
Merge staging-next-21.05 into staging-21.05 2021-07-27 12:03:08 +00:00
github-actions[bot]
5d113ea732
Merge release-21.05 into staging-next-21.05 2021-07-27 12:02:35 +00:00
Sandro
1bd5157b2c
Merge pull request #130829 from NixOS/backport-130273-to-release-21.05 2021-07-27 11:37:02 +00:00
github-actions[bot]
770db2f4e0
Merge staging-next-21.05 into staging-21.05 2021-07-27 06:03:10 +00:00
github-actions[bot]
0aa5191556
Merge release-21.05 into staging-next-21.05 2021-07-27 06:02:15 +00:00
Domen Kožar
82151321ee
Merge pull request #129773 from pca006132/backport
[21.05] rtw89: init at 2021-07-03
2021-07-27 06:51:03 +02:00
Aaron Andersen
d935d519dc
Merge pull request #131575 from NixOS/backport-131209-to-release-21.05
[Backport release-21.05] hydroxide: 0.2.18 -> 0.2.19
2021-07-26 21:32:22 -04:00
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
misuzu
fd5d487ef4 binutils: apply R_ARM_COPY.patch only when cross-compiling to armv7l
Applying R_ARM_COPY.patch when not cross-compiling breaks native armv7l builds.

(cherry picked from commit 5aad70e8beb98a1c855facea5c9749f644e8b897)
2021-07-26 07:30:13 +00:00
Francesco Gazzetta
b69f8981c8 warzone2100: 4.1.0 -> 4.1.1
(cherry picked from commit 6be2cb762e9a12e9e1086682cd3f86aa35858207)
2021-07-26 09:21:28 +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
Francesco Gazzetta
8fb41def7c warzone2100: 4.0.1 -> 4.1.0
(cherry picked from commit 299f265ce50861b3733733df5da2506c8e25c054)
2021-07-26 09:21:13 +02:00
Francesco Gazzetta
9e4f215465 warzone2100: better fix for absolute bindir
(cherry picked from commit b5b5dbb62d959e743742e75ef342ff9fca392ada)
2021-07-26 09:20:38 +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