github-actions[bot]
013ea05e19
Merge release-21.05 into staging-next-21.05
2021-07-04 00:02:39 +00:00
Aaron Andersen
806c01c9f9
Merge pull request #128840 from NixOS/backport-126284-to-release-21.05
...
[Backport release-21.05] zabbixAgent: add bash to $PATH
2021-07-03 15:12:06 -04:00
github-actions[bot]
a581dcb108
Merge staging-next-21.05 into staging-21.05
2021-07-03 18:02:47 +00:00
github-actions[bot]
b657e42102
Merge release-21.05 into staging-next-21.05
2021-07-03 18:02:14 +00:00
Jörg Thalheim
9143023abb
Merge pull request #129159 from NixOS/backport-129155-to-release-21.05
...
[Backport release-21.05] doc: point out that nixos-21.05 has gnuradio 3.9
2021-07-03 18:58:39 +01:00
Jörg Thalheim
7001c0cf15
Merge pull request #129158 from NixOS/backport-129153-to-release-21.05
...
[Backport release-21.05] doc: fix link to kodi-19.0 announcement
2021-07-03 18:58:16 +01:00
Bjørn Forsman
5ca9576f49
doc: point out that nixos-21.05 has gnuradio 3.9
...
Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio
3.9"), because it was lost in the conversion from docbook to markdown, in
commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)").
(Apparently we have both .md and .xml release notes now, and CI fails
unless they have the same content (after .md processing), so update the
.xml file to match...)
(cherry picked from commit cfe8c3a75eaa427f48bc93b15c65b826c00d7401)
2021-07-03 17:44:27 +00:00
Bjørn Forsman
950142c900
doc: fix link to kodi-19.0 announcement
...
Logically re-apply 7afaacf9a8 ("doc: fix link to kodi-19.0 announcement"),
because it was lost in the conversion from docbook to markdown, in commit
32c2dd304d ("docs: nixos release notes to CommonMark (2105)").
(Hm, apparently we have *both* docbook and markdown? CI failed before I
updated the .xml file.)
(cherry picked from commit c2a3ff28be9712b598d84cdc94a7894ca59c772c)
2021-07-03 17:44:02 +00:00
Vladimír Čunát
fdaa714f38
Merge branch 'staging-next-21.05' into release-21.05
2021-07-03 15:17:49 +02:00
davidak
883e7d81a2
Merge pull request #128707 from NixOS/backport-128316-to-release-21.05
...
[Backport release-21.05] pantheon.notes-up: 2.0.2 -> unstable-2020-12-29
2021-07-03 15:02:15 +02:00
github-actions[bot]
d2c547f5b3
Merge staging-next-21.05 into staging-21.05
2021-07-03 12:03:13 +00:00
github-actions[bot]
f69d5bc5d0
Merge release-21.05 into staging-next-21.05
2021-07-03 12:02:32 +00:00
Jörg Thalheim
2a0b054afa
Merge pull request #124935 from NixOS/backport-124690-to-release-21.05
...
[Backport release-21.05] bitwarden: 1.24.6 -> 1.26.4
2021-07-03 11:17:49 +01:00
Jörg Thalheim
9cc09d4302
Merge pull request #129078 from NixOS/backport-129012-to-release-21.05
...
[Backport release-21.05] python3Packages.django_3: 3.2.4 -> 3.2.5
2021-07-03 07:47:04 +01:00
Jörg Thalheim
fbf817714e
Merge pull request #129073 from Mic92/dpdk-backport
...
[21.05] linuxPackages.dpdk: remove alias
2021-07-03 07:17:49 +01:00
Jörg Thalheim
fa55b0121e
Merge pull request #128445 from maxeaubrey/21.05_go_1.16
...
[21.05] go_1_16: 1.16.4 -> 1.16.5
2021-07-03 07:06:11 +01:00
github-actions[bot]
978b57f31d
Merge staging-next-21.05 into staging-21.05
2021-07-03 06:04:23 +00:00
Jörg Thalheim
c1bddbe5a1
Merge pull request #129077 from NixOS/backport-129042-to-release-21.05
...
[Backport release-21.05] tlaToolbox: fix crash on file open dialog
2021-07-03 07:02:57 +01:00
github-actions[bot]
31d5f83f39
Merge release-21.05 into staging-next-21.05
2021-07-03 06:02:17 +00:00
Martin Weinelt
a115c9d5e0
python3Packages.django_3: 3.2.4 -> 3.2.5
...
(cherry picked from commit d7e08efa95c983ac8b2ab38c7cc6b417f65088e0)
2021-07-03 05:51:20 +00:00
Sarunas Valaskevicius
15e437c635
tlaToolbox: fix crash on file open dialog
...
(cherry picked from commit 5b69b1f3fe471c2336aa37a7d14ec389ba3f135d)
2021-07-03 05:50:45 +00:00
Jörg Thalheim
035c6b0ee9
linuxPackages.dpdk: remove alias
...
This was causing evaluation errors in some instances.
Fixes https://github.com/NixOS/nixpkgs/issues/127275
(cherry picked from commit 0e82a3269727fb4c8e3d0b71a7048b465b3be8e4)
2021-07-03 06:17:45 +02:00
Jörg Thalheim
fe80e34fef
Merge pull request #126738 from NixOS/backport-126060-to-release-21.05
...
[Backport release-21.05] dpdk-kmods: init at 2021-04-21
2021-07-03 05:06:36 +01:00
Luke Granger-Brown
06f48c14d6
Merge pull request #129056 from NixOS/backport-128794-to-release-21.05
...
[Backport release-21.05] ceph: Enable cephfs-shell and use system liburing
2021-07-03 02:56:14 +01:00
ajs124
6ef0575e0f
Merge pull request #128913 from helsinki-systems/bkp/21.05/php
...
[21.05] php73: 7.3.28 -> 7.3.29, php74: 7.4.20 -> 7.4.21, php80: 8.0.7 -> 8.0.8
2021-07-03 02:50:05 +02:00
Mario Rodas
91b3d48d6e
Merge pull request #129053 from marsam/backport-128928-to-release-21.05
...
[21.05] nodejs: 12.22.1 -> 12.22.2, 14.17.0 -> 14.17.2, 16.2.0 -> 16.4.1
2021-07-02 19:47:46 -05:00
Luke Granger-Brown
03fb82074c
Merge pull request #128699 from NixOS/backport-123474-to-release-21.05
...
[Backport release-21.05] yaxg: use ffmpeg instead of ffmpeg_3
2021-07-03 01:43:12 +01:00
Janne Heß
bae7213808
ceph: Enable cephfs-shell and use system liburing
...
(cherry picked from commit 196a7136a953eb3fa1b28a17b8d51126b0ee8372)
2021-07-03 00:38:05 +00:00
github-actions[bot]
00ed470603
Merge staging-next-21.05 into staging-21.05
2021-07-03 00:06:44 +00:00
github-actions[bot]
a9f1434ec7
Merge release-21.05 into staging-next-21.05
2021-07-03 00:03:28 +00:00
Mario Rodas
6af75274fc
beam: update reference to nodejs package
...
nodejs-15_x has reached EOL, and removed from nixpkgs.
(cherry picked from commit 39916f933ebef93e473115c5160e285d76d30133)
2021-07-02 18:43:50 -05:00
Mario Rodas
5225ed8b95
nodejs-15_x: remove expression
...
Node.js 15 has reached EOL on June 1, 2021.
(cherry picked from commit fd918d34bdbe94797afd6ca10cd4d578acce7943)
2021-07-02 18:43:50 -05:00
Mario Rodas
0cde4bf18f
nodejs-16_x: 16.4.0 -> 16.4.1
...
https://github.com/nodejs/node/releases/tag/v16.4.1
(cherry picked from commit 4f90b61a11496e16d2e460301b73426ddd2be0b8)
2021-07-02 18:43:49 -05:00
Mario Rodas
3de5eef80f
nodejs-14_x: 14.17.1 -> 14.17.2
...
https://github.com/nodejs/node/releases/tag/v14.17.2
(cherry picked from commit 282c97bb2766590e12e8d393240fe63c235bfdf0)
2021-07-02 18:43:49 -05:00
Mario Rodas
77f9266ab7
nodejs-12_x: 12.22.1 -> 12.22.2
...
https://github.com/nodejs/node/releases/tag/v12.22.2
(cherry picked from commit a7a66aa2ea8715d5ce043f24d408a21fedf83c5f)
2021-07-02 18:43:48 -05:00
Mario Rodas
1e27742a0c
nodejs-16_x: 16.3.0 -> 16.4.0
...
https://github.com/nodejs/node/releases/tag/v16.4.0
(cherry picked from commit c50bd80253a3066af270466909f0f53b0adc4b04)
2021-07-02 18:43:31 -05:00
Mario Rodas
37573d9874
nodejs-16_x: 16.2.0 -> 16.3.0
...
https://github.com/nodejs/node/releases/tag/v16.3.0
(cherry picked from commit 969eb59f2f253112339dac99e429fb01b7a48bf4)
2021-07-02 18:43:30 -05:00
Mario Rodas
e12702b599
nodejs-14_x: 14.17.0 -> 14.17.1
...
https://github.com/nodejs/node/releases/tag/v14.17.1
(cherry picked from commit 3a61dc3cae9ed275ab6da0c577d828734ac99295)
2021-07-02 18:41:22 -05:00
Luke Granger-Brown
917357a287
nixos/tests/kernel-generic: fix evaluation
...
This is breaking the tarball build, because #128502 depends on this test
existing. After this commit, nixpkgs.tarball once again evaluates.
(cherry picked from commit 0dccbe2729efbaee995605bff8de3c83ca61860f)
2021-07-02 13:50:19 -07:00
Yurii Matsiuk
23b6a0735b
linux_5_13: init at 5.13
...
(cherry picked from commit 367a53a82b0a3ffe6c1ea4261c22764129994669)
2021-07-02 13:50:19 -07:00
Lengyel Balázs
db3b901f0b
linux-kernel: update config for 5.13
...
(cherry picked from commit 2ac508d578a99c447fabf97fa7b788062da70b95)
2021-07-02 13:50:19 -07:00
John Ericson
4a448d3240
Merge pull request #129001 from obsidiansystems/ipfs_latest-for-stable
...
[21.05] ipfs: Add 0.9.0 in addition
2021-07-02 16:07:50 -04:00
Maximilian Bosch
4dab07340d
Revert "libdrm: 2.4.105 -> 2.4.106"
...
This reverts commit edba06511c
.
2021-07-02 20:52:55 +02:00
John Ericson
0b2fbb2fef
ipfs: Add 0.9.0 in addition
...
IPFS evolves quite fast. The network protocol is compatible, but we
don't want to force migrations on stable, so we add a new version
instead.
See #100676 for last time we did this.
(Adapted from from commit d96ccfaf16c5454aaa920ff39b38c81bcf104a3a)
2021-07-02 14:43:56 +00:00
John Ericson
aa24875207
ipfs: prepare to add 0.9 in addition
...
(cherry picked from commit 27949d611a7cca14e21438df725f7c6356f458ac)
2021-07-02 14:36:46 +00:00
github-actions[bot]
c75ea2baa8
Merge staging-next-21.05 into staging-21.05
2021-07-02 00:05:13 +00:00
github-actions[bot]
fee3e6f902
Merge release-21.05 into staging-next-21.05
2021-07-02 00:04:25 +00:00
Robert Scott
21b696caf3
python3Packages.fastapi: 0.65.0 -> 0.65.2
...
resolves CVE-2021-32677
(cherry picked from commit f582fd647537619424e49edbb2fad36c20889194)
2021-07-01 14:54:38 -07:00
Robert Scott
0949abcecd
python3Packages.pydantic: 1.8.1 -> 1.8.2
...
resolves CVE-2021-29510
(cherry picked from commit 7bc6972957203c0857a1e1618c78368e898a4f40)
2021-07-01 14:54:38 -07:00
Andrew Childs
f77d176ec6
root: use pure CoreSymbolication on Darwin
...
The current build works by linking against CoreSymbolication in
/System/Library/PrivateFrameworks. This is impure and doesn't work in
newer versions of macOS.
See https://github.com/NixOS/nixpkgs/issues/128576
(cherry picked from commit 55dcd998597257714c4a5362c14845a9363dde66)
2021-07-01 13:56:15 -07:00