Yurii Matsiuk
24d3d7b72c
linux/hardened/patches/5.12: 5.12.12-hardened1 -> 5.12.14-hardened1
...
(cherry picked from commit 6643bf87ae69a2e3edcbc47f2dc841246e02372e)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
faa6d6b9b1
linux/hardened/patches/5.10: 5.10.45-hardened1 -> 5.10.47-hardened1
...
(cherry picked from commit 344bf9c20e10e5484a72d3dc1a77d31d1aed9e84)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
99d53a0c89
linux/hardened/patches/4.19: 4.19.195-hardened1 -> 4.19.196-hardened1
...
(cherry picked from commit 5a058ab3846b568ee71b6356fa35d1e383e6ce27)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
15f8e24bc6
linux/hardened/patches/4.14: 4.14.237-hardened1 -> 4.14.238-hardened1
...
(cherry picked from commit c7323350678a84f0557d475e94887fe94005086b)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
926c9aabc7
linux: 5.4.127 -> 5.4.129
...
(cherry picked from commit 5da58d1f67170c3dd5da6fc86d38f0d28abe4f12)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
b0214fccfb
linux: 5.12.12 -> 5.12.14
...
(cherry picked from commit d28212b0842fea0e03376247320f7b41da4abef1)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
a18dea6fb6
linux: 5.10.45 -> 5.10.47
...
(cherry picked from commit f52103a4e69179631828d453ba0ca68add15952c)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
dc34cf70c8
linux: 4.9.273 -> 4.9.274
...
(cherry picked from commit 24a5777be9e967bef974fb769b386665b671a6af)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
e168b5bcc9
linux: 4.4.273 -> 4.4.274
...
(cherry picked from commit ffdd1ac7768c9eb5a1f0a134adc0e5ce473ca3a5)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
d638fb5525
linux: 4.19.195 -> 4.19.196
...
(cherry picked from commit a5394f31e8cc9f24a549d6070ee6153e1f946537)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
78ff5dfec2
linux: 4.14.237 -> 4.14.238
...
(cherry picked from commit 1c15f4eef1c304e8d89a2f42554c503c4925e1cf)
2021-07-05 18:13:06 +00:00
Yurii Matsiuk
bc1ca1fa6b
Revert "linux: fix regression in bridge VLAN configuration"
...
This reverts commit 24a08441d52480cf3332a100e24fdf9b83a8351a.
(cherry picked from commit 2f0d1e41e254e55e2668f19faf2f307598e43f6e)
2021-07-05 18:13:06 +00:00
github-actions[bot]
e6d2640290
Merge staging-next-21.05 into staging-21.05
2021-07-05 18:02:58 +00:00
github-actions[bot]
956c0c163d
Merge release-21.05 into staging-next-21.05
2021-07-05 18:02:21 +00:00
paumr
340976f347
cnijfilter_4_00: fix broken build
...
30286ebcc1
updated glibc to 2.32.
This removed the deprecated <sys/sysctl.h> header, which caused a build
error on this package.
Since this header doesn't seem to be required it was removed with this
patch.
(cherry picked from commit c9f2aeec17719d009d764e58e573e974212e7b10)
2021-07-05 18:25:41 +02:00
Thomas Gerbet
c57281c274
trafficserver: 9.0.1 -> 9.0.2
...
Fixes CVE-2021-32566 and CVE-2021-32567.
(cherry picked from commit d41e86c67ff65b898be3952bf66f803a121cd083)
2021-07-05 16:07:35 +00:00
Bjørn Forsman
688f6ec8d7
nixos/hamster: fix programs.hamster.enable text
...
mkEnableOption already adds "Whether to enable" and ends with a ".", so
remove that duplication from the help text.
Also reword it slightly while at it.
(cherry picked from commit 5d3dca497ba7d20c662e8144c0bedb69433a9e4a)
2021-07-05 14:32:16 +02:00
Fabian Affolter
b77d450779
tcpdump: 4.99.0 -> 4.99.1
...
(cherry picked from commit 228adbbf7151ba2aad2cc8a4f103001d2bd20107)
2021-07-04 20:29:05 +00:00
github-actions[bot]
e2056bc4b2
Merge staging-next-21.05 into staging-21.05
2021-07-04 00:03:23 +00:00
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