Commit Graph

294820 Commits

Author SHA1 Message Date
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
Martin Weinelt 5db0a5d9a8 ansible_2_9: 2.9.25 -> 2.9.26
(cherry picked from commit 662df6f4ab97ca3fd81822448def9d13e349076e)
2021-09-18 03:51:41 +02:00
Martin Weinelt e651e0ed60 ansible_2_10: 2.10.13 -> 2.10.14
(cherry picked from commit 4156a5516dd2b8ca19b5ecbf307a6024e8f4861b)
2021-09-18 03:51:41 +02:00
Martin Weinelt 68ba4fd43c ansible_2_11: 2.11.4 -> 2.11.5
(cherry picked from commit 31f932af46864ad5b18d8837586b9e6b9e5f89a8)
2021-09-18 03:51:41 +02:00
Martin Weinelt c1aea1347e ansible_2_11.collections: 4.4.0 -> 4.5.0
(cherry picked from commit 6cb6e67ba1133bbf4ce05d1b550dbc8c7140c0ae)
2021-09-18 03:51:41 +02:00
Jörg Thalheim 248a53d37a ansible: fix https url
(cherry picked from commit b113d0c2039ab55212638dcd1a6d0de44ce321f6)
2021-09-18 03:51:41 +02:00
Martin Weinelt 8fef5752e4 python3Packages.ansible: 2.9.24 -> 2.9.25
(cherry picked from commit 351eacd7b91c79774b4647e6bbb8aa179eb6e94e)
2021-09-18 03:51:41 +02:00
Martin Weinelt 27a85d3fb6 python3Packages.ansible-core.collections: 4.2.0 -> 4.4.0
(cherry picked from commit 9dd696bebb51fd6b29cc4d6062912306aa5ad669)
2021-09-18 03:51:41 +02:00
Martin Weinelt 47a2720118 python3Packages.ansible-core: 2.11.3 -> 2.11.4
(cherry picked from commit aed6574b7e673cb2c9ff672b559c1bf101809524)
2021-09-18 03:51:41 +02:00
Martin Weinelt b72e5dddca python3Packages.ansible-base: 2.10.12 -> 2.10.13
(cherry picked from commit a02ec1002d077cda0ffb3b063d9ff8e9046c9738)
2021-09-18 03:51:41 +02:00
Austin Butler 8fa3d05020 pythonPackages.resolvelib: 0.7.1 -> 0.5.5
(cherry picked from commit c070b9e4f55bf474241359621bbb564fc00a39bc)
2021-09-18 03:51:41 +02:00
Martin Weinelt a7635ed014 python3Packages.resolvelib: 0.7.0 -> 0.7.1
(cherry picked from commit 50140f70d5cbb9d388df345c0eaf693c128f6487)
2021-09-18 03:51:41 +02:00
Martin Weinelt c2a0f606fc python3Packages.ansible: 2.9.23 -> 2.9.24
(cherry picked from commit a9206d8c4c85ca6387129753f8a3877bc8a5321f)
2021-09-18 03:51:41 +02:00
Martin Weinelt 94bdd1f98c python3Packages.ansible-core.collections: 4.1.0 -> 4.2.0
(cherry picked from commit dc1137bc98695e2ac2ae71bec57593d801481fdc)
2021-09-18 03:51:41 +02:00
Martin Weinelt 98f655786a python3Packages.ansible-base: 2.10.11 -> 2.10.12
(cherry picked from commit 32d56411205ba845946d94f68528ddc1c631d337)
2021-09-18 03:51:41 +02:00
Martin Weinelt 0c9daa6b7a python3Packages.ansible-core: 2.11.2 -> 2.11.3
(cherry picked from commit 1e462be4ebd7317e5343f77049625ed09f7aade8)
2021-09-18 03:51:40 +02:00
Martin Weinelt ba21a7bc10 ansible, ansible_2_10: internalize collections package
This drops the python3Packages.ansible-collections attribute in favor of
a local callPackage that overwrites the collections package per ansible
version.

(cherry picked from commit ca618d6401631cf2c82c81220c54e774b514297f)
2021-09-18 03:51:40 +02:00
Martin Weinelt 10f8ee55fe ansible: 2.11.1 -> 2.11.2
(cherry picked from commit bedf7abd6a1ceb3ebd15e26aabbd769c8620fd10)
2021-09-18 03:51:40 +02:00
R. RyanTM 6ae0a35f2c ansible: 2.11.0 -> 2.11.1
(cherry picked from commit 41f507b1ef4175ec6a26b5e19c1118dbda983a42)
2021-09-18 03:51:40 +02:00
Martin Weinelt e3bd81828b ansible_2_11: init 2021-09-18 03:51:40 +02:00
Martin Weinelt 6a7d63f3d6 python3Packages.ansible-core: init at 2.11.0
(cherry picked from commit 8e390750e320741c54aeb41aa239ae5ac108687f)
2021-09-18 03:51:40 +02:00
Martin Weinelt 658b63c41b python3Packages.resolvelib: init at 0.7.0
(cherry picked from commit 23414c5026bd1a2c612786053aa7c5a21b26378f)
2021-09-18 03:51:40 +02:00
Sandro Jäckel 231881e440 python3Packages.commentjson: init at 0.9.0
(cherry picked from commit b36764fcbe644bf1aedd3857db0e940d2a8503e5)
2021-09-18 03:51:40 +02: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