Commit Graph
293115 Commits
Author SHA1 Message Date
github-actions[bot] 263da55900 Merge staging-next-21.05 into staging-21.05 2021-07-19 12:02:54 +00:00
github-actions[bot] 37526ae1e0 Merge release-21.05 into staging-next-21.05 2021-07-19 12:02:19 +00:00
Maximilian Bosch 4181644d09 Merge pull request #130575 from NixOS/backport-130562-to-release-21.05
[Backport release-21.05] Kernels 2021-07-18
2021-07-19 09:24:43 +02:00
Kim Lindberger 2fa8b636af Merge pull request #130271 from NixOS/backport-129464-to-release-21.05
[Backport release-21.05] discourse: Updates and fixes
2021-07-19 08:26:30 +02:00
github-actions[bot] 804de3ebec Merge staging-next-21.05 into staging-21.05 2021-07-19 00:03:39 +00:00
github-actions[bot] 06b06a16b6 Merge release-21.05 into staging-next-21.05 2021-07-19 00:02:56 +00:00
Anderson Torres 6b940846e9 Merge pull request #130582 from svanderburg/add-fs-uae-frontend-stable
[Backport release-21.05] fs-uae-launcher: init at 3.0.5
2021-07-18 20:20:07 -03:00
Maximilian Bosch d5369485e0 Merge pull request #130536 from Ma27/2105-grafana
[21.05] grafana: 7.5.9 -> 7.5.10
2021-07-18 23:49:37 +02:00
Sander van der Burg 2689890bce fs-uae-launcher: init at 3.0.5
(cherry picked from commit f123928ec1e660132de15f6b5ff6a2902ad225f6)
2021-07-18 23:14:26 +02:00
Artturin 6a1885ca6d discord: symlink Discord to discord to be consistent
with distros such as arch

(cherry picked from commit f0adbd1d9f71473fd21b245b867c3235a3b2846a)
2021-07-18 14:03:19 -07:00
TredwellGit 49809d08b5 linux/hardened/patches/5.4: 5.4.130-hardened1 -> 5.4.132-hardened1
(cherry picked from commit f011a85f289507bef66b10759de524d0467821eb)
2021-07-18 18:59:28 +00:00
TredwellGit e662fb27af linux/hardened/patches/5.12: 5.12.15-hardened1 -> 5.12.17-hardened1
(cherry picked from commit e6ed15ffc466e5bfe32c14a207c8e70abee50dd2)
2021-07-18 18:59:28 +00:00
TredwellGit 1989fef2a9 linux/hardened/patches/5.10: 5.10.48-hardened1 -> 5.10.50-hardened1
(cherry picked from commit b724837096d16e1b64f18228e6ab01ca1dc491ce)
2021-07-18 18:59:28 +00:00
TredwellGit 5a3ca4155f linux/hardened/patches/4.19: 4.19.196-hardened1 -> 4.19.197-hardened1
(cherry picked from commit 888c46fe62dd87556537da8b04684a63be5cb54e)
2021-07-18 18:59:27 +00:00
TredwellGit c060b9e244 linux/hardened/patches/4.14: 4.14.238-hardened1 -> 4.14.239-hardened1
(cherry picked from commit 73667e11f3b8da2237b4e43816d59151b2f7af50)
2021-07-18 18:59:27 +00:00
TredwellGit 0bacfc6d6a linux-rt_5_10: 5.10.47-rt45 -> 5.10.47-rt46
(cherry picked from commit 9e7fd90e153006f1ec5cdd612eb70305c19019db)
2021-07-18 18:59:26 +00:00
TredwellGit 72df626b31 linux: 5.4.130 -> 5.4.132
(cherry picked from commit 5d99998e07ec4f60da6bd0c822356bfecbbbc947)
2021-07-18 18:59:26 +00:00
TredwellGit f507e4793b linux: 5.12.15 -> 5.12.17
(cherry picked from commit 677dcff2aa039ede045ad751da0a0877238ed2cc)
2021-07-18 18:59:26 +00:00
TredwellGit 0f9b1b3bec linux: 5.10.48 -> 5.10.50
(cherry picked from commit a2259ae9a6a48adc580906a9dcfe653f08aa3a94)
2021-07-18 18:59:25 +00:00
TredwellGit 32e57d3b3a linux: 4.19.196 -> 4.19.197
(cherry picked from commit cb978946c1a99c8e6a204d0e45cc7078f331673c)
2021-07-18 18:59:25 +00:00
TredwellGit 13bce99087 linux: 4.14.238 -> 4.14.239
(cherry picked from commit e3eace9baa10d524173e34cad3d2a31c2413f8cc)
2021-07-18 18:59:24 +00:00
github-actions[bot] e03b5e0de8 Merge staging-next-21.05 into staging-21.05 2021-07-18 18:02:49 +00:00
github-actions[bot] 69aec0b491 Merge release-21.05 into staging-next-21.05 2021-07-18 18:02:17 +00:00
Robert Scott c41fdc54ac Merge pull request #129339 from paumr/backport_cnijfilter_4_00_bugfix
[21.05] cnijfilter_4_00: fix broken build
2021-07-18 15:09:50 +01:00
github-actions[bot] 56e08b77af Merge staging-next-21.05 into staging-21.05 2021-07-18 12:04:16 +00:00
github-actions[bot] f622b5aa42 Merge release-21.05 into staging-next-21.05 2021-07-18 12:03:12 +00:00
Jörg Thalheim e80a619241 Merge pull request #130530 from NixOS/backport-130146-to-release-21.05
[Backport release-21.05] treewide: convert all links git.archlinux.org to github.com/archlinux…
2021-07-18 12:03:38 +01:00
Jörg Thalheim a3a2205e49 Merge pull request #126165 from erdnaxe/backport
[21.05] libgudev: support cross-compilation by disabling introspection and vala
2021-07-18 11:47:51 +01:00
Maximilian Bosch eaa8e6543c grafana: 7.5.9 -> 7.5.10
ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.10

On `master` (i.e. 21.11) we already have Grafana 8.0, but I don't really
want to backport this major release, so it's fair IMHO to update Grafana
here to make sure that 21.05-users still get bugfixes.
2021-07-18 12:11:04 +02:00
Sandro Jäckel efd1d6fe1b treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-*
(cherry picked from commit 388a4ef42345775a85d823597dadf25d4f0a5209)
2021-07-18 09:17:54 +00:00
Michael Weiss f4ba3aa382 Merge pull request #130516 from NixOS/backport-130438-to-release-21.05
[Backport release-21.05] ungoogled-chromium: 91.0.4472.114 -> 91.0.4472.164
2021-07-18 10:55:02 +02:00
Michael Weiss d313fefef8 ungoogled-chromium: 91.0.4472.114 -> 91.0.4472.164
(cherry picked from commit c5e29c786ffa9413a358ed3accf52e22a27f01cb)
2021-07-18 05:02:13 +00:00
github-actions[bot] 679c5a275a Merge staging-next-21.05 into staging-21.05 2021-07-18 00:03:22 +00:00
github-actions[bot] ed300216ad Merge release-21.05 into staging-next-21.05 2021-07-18 00:02:47 +00:00
Ben Siraphob 268dee8429 Merge pull request #129728 from prusnak/electron-21.05
[21.05] Update Electron
2021-07-18 01:18:03 +07:00
github-actions[bot] 1c34eae5cc Merge staging-next-21.05 into staging-21.05 2021-07-17 18:02:31 +00:00
github-actions[bot] 1bf00c66cc Merge release-21.05 into staging-next-21.05 2021-07-17 18:02:00 +00:00
Jörg Thalheim dd0139d3f0 Merge pull request #130455 from NixOS/backport-130436-to-release-21.05
[Backport release-21.05] putty: 0.74 -> 0.75
2021-07-17 18:56:04 +01:00
Martin Weinelt 2170b885b9 Merge pull request #130449 from NixOS/backport-130435-to-release-21.05
[Backport release-21.05] openresty: 1.19.3.1 -> 1.19.3.2
2021-07-17 19:09:26 +02:00
Maximilian Bosch a61bb245a6 Merge pull request #130362 from NixOS/backport-130358-to-release-21.05
[Backport release-21.05] gitea: 1.14.4 -> 1.14.5
2021-07-17 15:59:28 +02:00
Thomas Gerbet 01e9acfe66 putty: 0.74 -> 0.75
Fixes CVE-2021-36367.

(cherry picked from commit 2931283a42b800a10088738261ea422a69499c8e)
2021-07-17 13:18:39 +00:00
Jörg Thalheim 0a96dbc8b6 Merge pull request #130428 from NixOS/backport-125387-to-release-21.05
[Backport release-21.05] python2Packages.convertdate: fix hash
2021-07-17 14:12:51 +01:00
Robert Scott 460f322171 Merge pull request #130293 from NixOS/backport-130290-to-release-21.05
[Backport release-21.05] fig2dev: apply patch for CVE-2021-3561
2021-07-17 13:47:03 +01:00
Robert Scott c6adf089e0 Merge pull request #129336 from NixOS/backport-129239-to-release-21.05
[Backport release-21.05] trafficserver: 9.0.1 -> 9.0.2
2021-07-17 13:35:26 +01:00
Thomas Gerbet b840bd41db openresty: 1.19.3.1 -> 1.19.3.2
Fixes CVE-2021-23017.

https://openresty.org/en/ann-1019003002.html
(cherry picked from commit 2dbdca1aa4ce10d3de8e40dcdeed6df6bde4175c)
2021-07-17 12:09:02 +00:00
github-actions[bot] aabde49ee7 Merge staging-next-21.05 into staging-21.05 2021-07-17 12:04:03 +00:00
github-actions[bot] 571bc24140 Merge release-21.05 into staging-next-21.05 2021-07-17 12:03:01 +00:00
Martin Weinelt ad6d20a5b2 Merge pull request #130372 from NixOS/backport-130365-to-release-21.05
[Backport release-21.05] knot-dns: 3.0.7 -> 3.0.8
2021-07-17 13:05:01 +02:00
TredwellGit e5eac6b830 wireshark: 3.4.6 -> 3.4.7
https://www.wireshark.org/docs/relnotes/wireshark-3.4.7.html
(cherry picked from commit c9fbd30220499365baa0e7a5ea217c4ddd690e35)
2021-07-17 10:36:54 +02:00
Dmitry Kalinkin 1ad8c705fa python3Packages.matplotlib: 3.4.1 -> 3.4.2
(cherry picked from commit 20a4f271bdc820ad66c2848cb1452db9ae5e3f00)
2021-07-17 09:07:51 +02:00