Commit Graph
294754 Commits
Author SHA1 Message Date
github-actions[bot] c1ac24653b Merge staging-next-21.05 into staging-21.05 2021-09-18 12:03:04 +00:00
github-actions[bot] e71a8d2db9 Merge release-21.05 into staging-next-21.05 2021-09-18 12:02:27 +00:00
Maximilian Bosch 89882817b7 Merge pull request #138331 from sumnerevans/backport-137869-to-release-21.05
[21.05] element-{web,desktop}: 1.8.4 -> 1.8.5
2021-09-18 13:55:06 +02:00
Maximilian Bosch 6cc3bda369 element-desktop: fix eval 2021-09-18 13:29:56 +02:00
Alyssa Ross 8268ee4368 squashfs-tools-ng: 1.1.2 -> 1.1.3
(cherry picked from commit 6e25d39cfd7479a16b11e42b401af5f492de7de7)
2021-09-18 11:26:31 +00:00
Michael Weiss 6a3729e4da Merge pull request #137897 from NixOS/backport-137888-to-release-21.05
[Backport release-21.05] chromium: 93.0.4577.63 -> 93.0.4577.82
2021-09-18 12:12:37 +02:00
github-actions[bot] de45944195 Merge staging-next-21.05 into staging-21.05 2021-09-18 06:04:21 +00:00
github-actions[bot] fb2ea82526 Merge release-21.05 into staging-next-21.05 2021-09-18 06:03:18 +00:00
Artturi 75c1664b44 Merge pull request #138238 from drupol/backport-138177-to-release-21.05
[Backport release-21.05] symfony-cli: 4.26.0 -> 4.26.3
2021-09-18 05:33:58 +03:00
github-actions[bot] 1b379960f0 Merge staging-next-21.05 into staging-21.05 2021-09-18 00:03:24 +00:00
github-actions[bot] 7def88012f Merge release-21.05 into staging-next-21.05 2021-09-18 00:02:49 +00:00
Sumner Evans b194ad04ea element-{web,desktop}: 1.8.4 -> 1.8.5
(cherry picked from commit 04732d7c56c72a5cbb12355df5701d06b971cece)

See https://github.com/NixOS/nixpkgs/pull/137869
2021-09-17 17:45:30 -04:00
John Ericson dba5c42f73 Merge pull request #138320 from NixOS/backport-138305-to-release-21.05
[Backport release-21.05] cc-wrapper: Add support for -mthumb / -marm
2021-09-17 15:15:43 -04:00
John Ericson 7ff267798e cc-wrapper: Add support for -mthumb / -marm
(cherry picked from commit d3407f1a3bab0dd8c139272ee354175c0b489903)
2021-09-17 19:03:07 +00:00
github-actions[bot] 4d34318507 Merge staging-next-21.05 into staging-21.05 2021-09-17 18:03:01 +00:00
github-actions[bot] 8accc2f968 Merge release-21.05 into staging-next-21.05 2021-09-17 18:02:27 +00:00
ajs124 2c75ca9c41 Merge pull request #138276 from NeQuissimus/2105_hardened_backport
[21.05] Hardened kernels backports
2021-09-17 18:04:05 +02:00
Maximilian Bosch 9723430b08 Merge pull request #138282 from NixOS/backport-138114-to-release-21.05
[Backport release-21.05] wireguard-tools: 1.0.20210424 -> 1.0.20210914
2021-09-17 16:41:42 +02:00
ajs124 756786068f linux/hardened/patches/5.14: 5.14.4-hardened1 -> 5.14.5-hardened1
(cherry picked from commit 9f34448a98ecc21726dd5e87b7a61daf76f954de)
2021-09-17 10:16:51 -04:00
ajs124 939149de74 linux/hardened/patches/5.4: 5.4.146-hardened1 -> 5.4.147-hardened1
(cherry picked from commit 36e21638f5f308d8985035bca9c14595c0a3b65f)
2021-09-17 10:16:50 -04:00
ajs124 e6b00f2f5f linux/hardened/patches/5.13: 5.13.17-hardened1 -> 5.13.18-hardened1
(cherry picked from commit 7c04d2e390a7dbb87a428f625839db42071b7b99)
2021-09-17 10:16:50 -04:00
ajs124 f35f202e06 linux/hardened/patches/5.10: 5.10.65-hardened1 -> 5.10.66-hardened1
(cherry picked from commit 031afe4faa1e390ebdc10eb145aaeab9be978cea)
2021-09-17 10:16:50 -04:00
Maximilian Bosch 0e29479866 wireguard-tools: 1.0.20210424 -> 1.0.20210914
ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-September/007049.html

This doesn't seem to have any implications for NixOS users, but appears
to have a few fixes that seem relevant to Darwin users including:

    wg-quick: darwin: account for "link#XX" gateways

    On macOS, under specific configurations, the `netstat -nr -f inet` and
    `netstat -nr -f inet6` outputs break gateway collection.

(cherry picked from commit d37ab4d0ee6aeb3187a0f0042cfca966c3ef2f78)
2021-09-17 13:55:18 +00:00
Maximilian Bosch cdc1eaf2f4 Merge pull request #138162 from NixOS/backport-138149-to-release-21.05
[Backport release-21.05] Kernels 2021-09-16
2021-09-17 15:51:34 +02:00
github-actions[bot] 0727e24c5c Merge staging-next-21.05 into staging-21.05 2021-09-17 12:02:59 +00:00
github-actions[bot] 08374b2bd8 Merge release-21.05 into staging-next-21.05 2021-09-17 12:02:25 +00:00
happysalada 30d0257247 vscodium: fix sha256 on linux
(cherry picked from commit 65a010bcead26c971fe5b01bb02c4a9f02d02271)
2021-09-17 19:10:27 +09:00
nixpkgs-upkeep-bot 5f4c5d41ea vscodium: 1.60.0 -> 1.60.1
(cherry picked from commit 4828eb7ae4f1105dcebf7245f453c607b9c77c1d)
2021-09-17 19:10:27 +09:00
R. RyanTM 912279a742 symfony-cli: 4.26.0 -> 4.26.3
(cherry picked from commit ff6fb898ac11223e281cffac992246e3b6c31a97)
2021-09-17 09:25:41 +02:00
github-actions[bot] 2757c95daf Merge staging-next-21.05 into staging-21.05 2021-09-17 00:04:52 +00:00
github-actions[bot] 719329b2d9 Merge release-21.05 into staging-next-21.05 2021-09-17 00:04:13 +00:00
Pavol Rusnak ebf419e737 Merge pull request #137988 from prusnak/electron-21.05
[21.05] electron_12: 12.1.0 -> 12.1.1
2021-09-17 00:21:07 +02:00
Luke Granger-Brown 6ffcbaf54d Merge pull request #138171 from NixOS/backport-136194-to-release-21.05
[Backport release-21.05] apr: add patch for CVE-2021-35940
2021-09-16 21:06:57 +01:00
Luke Granger-Brown b9e98053fe Merge pull request #138170 from NixOS/backport-138136-to-release-21.05
[Backport release-21.05] apacheHttpd: 2.4.48 -> 2.4.49
2021-09-16 21:05:50 +01:00
Robert Scott ef698f793f apr: add patch for CVE-2021-35940
(cherry picked from commit c6c39b5944d1ebc7f294ea9b78350beec67b21a8)
2021-09-16 18:45:22 +00:00
Aaron Andersen 6fbf63ac60 apacheHttpd: 2.4.48 -> 2.4.49
(cherry picked from commit 0518560cf13e1a08a93de6b562d6326c19a3294f)
2021-09-16 18:34:07 +00:00
TredwellGit 6c5790dfb6 linux/hardened/patches/5.4: 5.4.144-hardened1 -> 5.4.146-hardened1
(cherry picked from commit 00c500e9fc975957b4357ce46d5f10e8bf2cd1ba)
2021-09-16 16:18:21 +00:00
TredwellGit fbc340ce50 linux/hardened/patches/5.14: 5.14.2-hardened1 -> 5.14.4-hardened1
(cherry picked from commit 60b711316445f580345d815cfd04be592b136b8a)
2021-09-16 16:18:20 +00:00
TredwellGit cc619f3c02 linux/hardened/patches/5.13: 5.13.15-hardened1 -> 5.13.17-hardened1
(cherry picked from commit a8de1dcd2b5896d141bc89e0fc2cc665cd9581d7)
2021-09-16 16:18:19 +00:00
TredwellGit a1b9329753 linux/hardened/patches/5.10: 5.10.63-hardened1 -> 5.10.65-hardened1
(cherry picked from commit 48e902a2efa3bb149d4526125e57c1429af95014)
2021-09-16 16:18:19 +00:00
TredwellGit 49d3b04cd9 linux: 5.4.145 -> 5.4.147
(cherry picked from commit 100f0569b54abaf1ed49ed8f525678a7eb02ab9a)
2021-09-16 16:18:18 +00:00
TredwellGit 9b42fb070f linux: 5.14.3 -> 5.14.5
(cherry picked from commit 4a05e7297cc766a2e295725bb991a50605cebbea)
2021-09-16 16:18:17 +00:00
TredwellGit 2521537c8f linux: 5.13.16 -> 5.13.18
(cherry picked from commit 4954336e2b81ebcc108ffae0bf3a0a39d301030b)
2021-09-16 16:18:16 +00:00
TredwellGit a3a2df2aaa linux: 5.10.64 -> 5.10.66
(cherry picked from commit 6c829ce0830528f8e0ea78acfedec8a345b1f81b)
2021-09-16 16:18:15 +00:00
github-actions[bot] f903c39d88 Merge staging-next-21.05 into staging-21.05 2021-09-16 12:03:28 +00:00
github-actions[bot] 0d2ff3fbab Merge release-21.05 into staging-next-21.05 2021-09-16 12:02:44 +00:00
Patrick Hilhorst 4d71703763 Merge pull request #137439 from NixOS/backport-137328-to-release-21.05 2021-09-16 13:34:36 +02:00
github-actions[bot] d8bd6671da Merge staging-next-21.05 into staging-21.05 2021-09-15 12:02:43 +00:00
github-actions[bot] b4cf42c516 Merge release-21.05 into staging-next-21.05 2021-09-15 12:02:09 +00:00
Jörg Thalheim 8dd8bd8be7 Merge pull request #137984 from NixOS/backport-137673-to-release-21.05
[Backport release-21.05] github-runner: 2.281.1 -> 2.282.0, prevent self-update
2021-09-15 12:44:29 +01:00