Sandro
4feee8e633
Merge pull request #216994 from sielicki/ena-282-283
2023-02-19 15:31:41 +01:00
Jonas Heinrich
03ee925c05
firejail: Fix double-dash usage on non-POSIX shells
2023-02-19 07:49:26 -05:00
Yureka
d71d42707e
ell: disable tests on musl ( #217073 )
2023-02-19 13:39:59 +01:00
github-actions[bot]
85ba84c218
Merge master into staging-next
2023-02-19 12:01:25 +00:00
linsui
9156d02e92
waydroid: fix icon, shell and iptables
2023-02-19 12:17:11 +08:00
github-actions[bot]
a1eb3e0b3e
Merge master into staging-next
2023-02-19 00:02:27 +00:00
Yureka
a86d28efec
pkgsMusl.iucode-tool: fix build
2023-02-19 00:12:36 +01:00
Sergei Trofimovich
6c5bf4e060
Merge pull request #209667 from QuantMint/linux
...
linux: enable ACPI_FPDT, ACPI_HMAT, ACPI_APEI, ACPI_APEI_GHES, ACPI_DPTF
2023-02-18 20:54:24 +00:00
Nicholas Sielicki
5dd7384427
linuxPackages.ena: 2.8.2 -> 2.8.3
...
Signed-off-by: Nicholas Sielicki <git@opensource.nslick.com>
2023-02-18 19:08:46 +00:00
R. Ryantm
acde7b8e9f
sasutils: 0.3.13 -> 0.4.0
2023-02-18 17:39:01 +00:00
Alyssa Ross
38f0121cce
Merge master (+ 11b095e
revert) into staging-next
...
Conflicts:
pkgs/development/libraries/libvisual/default.nix
2023-02-18 14:04:32 +00:00
Cole Helbling
4e2079b96d
linux_{5_15,6_1}: revert patch to fix Equinix Metal bonded networking with ice
driver
...
Some Equinix Metal instances, such as a3.large.x86, m3.large.x86
(specific hardware revisions), and n3.large.x86, use the `ice` kernel
driver for their network cards, in conjunction with bonded devices.
However, this commit caused a regression where these bonded devices
would deadlock. This was initially reported by Jaroslav Pulchart on
the netdev mailing list[1], and there were follow-up patches from Dave
Ertman[2][3] that attempted to fix this but were not up to snuff for
various reasons[4].
Specifically, v2 of the patch ([3]) appears to fix the issue on some
devices (tested with 8086:159B network cards), while it is still broken
on others (such as an 8086:1593 network card).
We revert the patch exposing the issue until upstream has a working
solution in order to make Equinix Metal instances work reliably again.
[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/
[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/
[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/
[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c
2023-02-16 10:06:24 -08:00
github-actions[bot]
164a7e44c7
Merge master into staging-next
2023-02-16 18:01:12 +00:00
R. Ryantm
f7d3b72f49
mmc-utils: unstable-2022-11-09 -> unstable-2023-02-09
2023-02-16 05:46:59 +00:00
github-actions[bot]
bf5abe92d4
Merge master into staging-next
2023-02-15 18:01:14 +00:00
Martin Weinelt
28319deb5a
Merge pull request #216406 from mweinelt/microcode-intel-20230214
...
microcodeIntel: 20221108 -> 20230214
2023-02-15 17:13:35 +00:00
superherointj
86ab97186b
Merge pull request #216472 from PedroHLC/zen-kernels-6.1.12
...
zen-kernels: 6.1.10 -> 6.1.12
2023-02-15 12:20:13 -03:00
K900
fa90359876
linux/hardened/patches/6.1: 6.1.10-hardened1 -> 6.1.11-hardened1
2023-02-15 13:48:15 +00:00
K900
5aec2a7956
linux/hardened/patches/5.15: 5.15.92-hardened1 -> 5.15.93-hardened1
2023-02-15 13:48:15 +00:00
K900
30a72be338
linux-rt_5_15: 5.15.92-rt57 -> 5.15.93-rt58
2023-02-15 13:48:15 +00:00
K900
6ee2f048f2
linux: 6.1.11 -> 6.1.12
2023-02-15 13:48:15 +00:00
K900
30e36d2e82
linux: 5.15.93 -> 5.15.94
2023-02-15 13:48:15 +00:00
PedroHLC ☭
bc12cf5976
linuxKernel.kernels.linux_zen: 6.1.10-zen1 -> 6.1.12-zen1
2023-02-15 09:25:17 -03:00
PedroHLC ☭
d7e04271d5
linuxKernel.kernels.linux_lqx: 6.1.10-lqx1 -> 6.1.12-lqx1
2023-02-15 09:23:47 -03:00
Martin Weinelt
36c3acef21
microcodeIntel: 20221108 -> 20230214
...
https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20230214
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00767.html
Fixes: CVE-2022-38090
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00738.html
Fixes: CVE-2022-33196
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00700.html
Fixes: CVE-2022-21216
2023-02-15 01:28:13 +01:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging
2023-02-15 00:02:50 +00:00
Felix Bühler
b025cb11c5
Merge pull request #214996 from Stunkymonkey/optionalString-1
...
treewide: use optionalString
2023-02-14 19:09:46 +01:00
Martin Weinelt
b38d6054d7
linuxPackages.ipu6-drivers: Reuse ivsc-driver source
...
Now that the ivsc-driver is packaged as well, we can reuse the source
files.
2023-02-14 18:33:30 +01:00
Martin Weinelt
6b33857238
ivsc-firmware: init at 2022-11-02
2023-02-14 18:33:30 +01:00
Martin Weinelt
9b4f6d4d92
linuxPackages.ivsc-driver: init at 2023-01-06
2023-02-14 18:33:29 +01:00
Martin Weinelt
134e4a6473
ipu6-camera-bin: init at 2022-11-12
...
Exposes both the ipu6 and ipu6ep firmware variants as top-level
packages.
2023-02-14 18:33:28 +01:00
Martin Weinelt
3c4862636f
linuxPackages.ipu6-drivers: init at 2023-01-17
2023-02-14 18:33:28 +01:00
Alyssa Ross
200610b849
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/libraries/gtest/default.nix
pkgs/development/libraries/hidapi/default.nix
2023-02-14 09:53:03 +00:00
K900
a143b4868f
linux-firmware: actually set updateScript
...
oof
2023-02-14 01:09:17 +03:00
Felix Buehler
cdb39a86e0
treewide: use optionalString
2023-02-13 21:52:34 +01:00
Artturi
fa169bb239
Merge pull request #214207 from Artturin/ssytemdbuildbash1
2023-02-13 22:34:23 +02:00
github-actions[bot]
f60ea3cf39
Merge staging-next into staging
2023-02-13 18:01:55 +00:00
Weijia Wang
2e47ae19ed
Merge pull request #216018 from r-ryantm/auto-update/ipset
...
ipset: 7.15 -> 7.17
2023-02-13 15:53:26 +01:00
github-actions[bot]
29cdca7736
Merge staging-next into staging
2023-02-13 06:02:02 +00:00
Alyssa Ross
c6c7493c3b
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pyarrow/default.nix
2023-02-13 00:15:28 +00:00
Guillaume Girol
81c60e22d9
Merge pull request #215378 from lilyinstarlight/fix/dracut-smaller-closure
...
dracut: reduce closure and suffix DRACUT_PATH
2023-02-12 20:48:49 +00:00
R. Ryantm
359896bd1b
ipset: 7.15 -> 7.17
2023-02-12 16:01:04 +00:00
github-actions[bot]
a5b021e538
Merge staging-next into staging
2023-02-11 12:01:48 +00:00
github-actions[bot]
cd4ded4f12
Merge master into staging-next
2023-02-11 12:01:14 +00:00
aktaboot
14ab222d2c
qmk-udev-rules: update
2023-02-10 21:52:46 +01:00
Lily Foster
6e8889d4ae
dracut: reduce closure and suffix DRACUT_PATH
...
Implements a few usability changes for dracut framework by suffixing
rather than prefixing `DRACUT_PATH` (so that downstream consumers can
more easily override it) and reduce closure size by bundling fewer
default utilities in `DRACUT_PATH`.
Done per comments at https://github.com/NixOS/nixpkgs/pull/210075#discussion_r1088822274 .
2023-02-10 13:35:49 -05:00
github-actions[bot]
1c178195e0
Merge staging-next into staging
2023-02-10 18:01:57 +00:00
github-actions[bot]
42cf9b70d4
Merge master into staging-next
2023-02-10 18:01:23 +00:00
Maximilian Bosch
98e4c1f8cf
linux/hardened/patches/6.1: 6.1.8-hardened1 -> 6.1.10-hardened1
2023-02-10 11:43:08 +01:00
Maximilian Bosch
85947aa9dd
linux/hardened/patches/5.4: 5.4.230-hardened1 -> 5.4.231-hardened1
2023-02-10 11:42:59 +01:00
Maximilian Bosch
2acd1ca6dc
linux/hardened/patches/5.15: 5.15.91-hardened1 -> 5.15.92-hardened1
2023-02-10 11:42:52 +01:00
Maximilian Bosch
b1033b4ae4
linux/hardened/patches/5.10: 5.10.166-hardened1 -> 5.10.167-hardened1
2023-02-10 11:42:45 +01:00
Maximilian Bosch
aa27dcf0cb
linux/hardened/patches/4.19: 4.19.271-hardened1 -> 4.19.272-hardened1
2023-02-10 11:42:37 +01:00
Maximilian Bosch
e094af5a4c
linux/hardened/patches/4.14: 4.14.304-hardened1 -> 4.14.305-hardened1
2023-02-10 11:42:30 +01:00
Maximilian Bosch
b43216c923
linux_latest-libre: 19044 -> 19049
2023-02-10 11:42:11 +01:00
Maximilian Bosch
91bf1a86ce
linux-rt_5_15: 5.15.86-rt56 -> 5.15.92-rt57
2023-02-10 11:41:47 +01:00
Maximilian Bosch
e684fcd484
linux: 6.1.10 -> 6.1.11
2023-02-10 11:41:32 +01:00
Maximilian Bosch
2b45841a0c
linux: 5.15.92 -> 5.15.93
2023-02-10 11:41:22 +01:00
github-actions[bot]
f72b07e57d
Merge staging-next into staging
2023-02-10 06:01:53 +00:00
github-actions[bot]
bff8e74964
Merge master into staging-next
2023-02-10 06:01:18 +00:00
Mario Rodas
3056c1eedd
Merge pull request #215424 from r-ryantm/auto-update/atop
...
atop: 2.7.1 -> 2.8.1
2023-02-09 22:11:06 -05:00
github-actions[bot]
0417b0e54f
Merge staging-next into staging
2023-02-10 00:03:00 +00:00
github-actions[bot]
71c0c6d984
Merge master into staging-next
2023-02-10 00:02:27 +00:00
Artturin
ae87533ba1
linuxHeaders: cleanup android
...
compared output and the build log and python2 is not required
both build
'pkgsCross.aarch64-android.linuxHeaders'
'pkgsCross.aarch64-android.bionic.linuxHeaders'
linux-headers> LEX scripts/kconfig/lexer.lex.c
linux-headers> sh: line 1: flex: command not found
linux-headers> YACC scripts/kconfig/parser.tab.[ch]
linux-headers> sh: line 1: bison: command not found
linux-headers> INSTALL ./usr/include
linux-headers> sh: line 1: rsync: command not found
Co-authored-by: exarkun <exarkun@twistedmatrix.com>
2023-02-09 20:10:33 +00:00
github-actions[bot]
87e315024e
Merge staging-next into staging
2023-02-09 18:01:44 +00:00
github-actions[bot]
b5d4dad2b8
Merge master into staging-next
2023-02-09 18:01:11 +00:00
R. Ryantm
62fb8fadbb
atop: 2.7.1 -> 2.8.1
2023-02-09 01:26:08 +00:00
Nick Cao
6d65e4f449
Merge pull request #215337 from PedroHLC/hwdata-0.367
...
hwdata: 0.366 -> 0.367
2023-02-09 08:13:10 +08:00
github-actions[bot]
bece38afcc
Merge staging-next into staging
2023-02-09 00:02:56 +00:00
Vladimír Čunát
1e42908aa7
Merge branch 'master' into staging-next
2023-02-08 21:50:23 +01:00
Maciej Krüger
f3ba738bfe
libnl-tiny: init at unstable-2022-12-13
2023-02-08 21:38:00 +01:00
Kiskae
89db9de377
linuxPackages.nvidia_x11_production: 525.85.05 -> 525.89.02
2023-02-08 20:21:58 +01:00
PedroHLC ☭
d5f88d5d1c
hwdata: 0.366 -> 0.367
2023-02-08 13:48:36 -03:00
Weijia Wang
29cfcee104
Merge pull request #215266 from r-ryantm/auto-update/rt-tests
...
rt-tests: 2.4 -> 2.5
2023-02-08 08:42:58 +01:00
R. Ryantm
d60172380e
rt-tests: 2.4 -> 2.5
2023-02-08 06:56:23 +00:00
R. Ryantm
9b23f8ed3b
sysstat: 12.6.1 -> 12.6.2
2023-02-08 04:57:12 +00:00
Sandro
eaaca27fa3
Merge pull request #215138 from laalsaas/util-linux-completion
2023-02-07 21:05:17 +01:00
github-actions[bot]
371c2a6303
Merge staging-next into staging
2023-02-07 18:02:15 +00:00
John Ericson
f0636c6055
treewide: Add meta.pkgConfigModules
to a few packages
...
Picking up where https://github.com/NixOS/nixpkgs/pull/214304 left off.
2023-02-07 12:15:32 -05:00
Vladimír Čunát
3356399453
Merge branch 'master' into staging-next
2023-02-07 17:36:16 +01:00
laalsaas
7d9ab620de
util-linux: install completion
2023-02-07 16:19:56 +01:00
Florian Klink
025d8692b2
Merge pull request #215094 from chuangzhu/systemd-want-gcrypt
...
systemd: fix build when withResolved=false and withImportd=true
2023-02-07 12:49:32 +01:00
Chuang Zhu
b89799acf0
systemd: fix build when withResolved=false and withImportd=true
2023-02-07 18:17:34 +08:00
R. Ryantm
7082124d63
setools: 4.4.0 -> 4.4.1
2023-02-07 05:42:29 +00:00
github-actions[bot]
b30088fc3f
Merge master into staging-next
2023-02-07 00:02:12 +00:00
superherointj
6ad074f20e
Merge pull request #215005 from r-ryantm/auto-update/kernelshark
...
kernelshark: 2.1.1 -> 2.2.0
2023-02-06 19:43:59 -03:00
R. Ryantm
6a1c0b75e6
kernelshark: 2.1.1 -> 2.2.0
2023-02-06 21:46:43 +00:00
superherointj
f4a0a30d54
Merge pull request #214957 from PedroHLC/zen-kernels-6.1.10
...
zen-kernels: 6.1.9 -> 6.1.10
2023-02-06 15:18:27 -03:00
github-actions[bot]
f876e1f1e9
Merge master into staging-next
2023-02-06 18:01:37 +00:00
PedroHLC ☭
789fe86ea7
linuxKernel.kernels.linux_lqx: 6.1.9-lqx1 -> 6.1.10-lqx1
2023-02-06 13:14:10 -03:00
PedroHLC ☭
06e0227204
linuxKernel.kernels.linux_zen: 6.1.9-zen1 -> 6.1.10-zen1
2023-02-06 13:08:17 -03:00
Maximilian Bosch
34a45dcebf
linux/hardened/patches/5.15: 5.15.90-hardened1 -> 5.15.91-hardened1
2023-02-06 11:34:05 +01:00
Maximilian Bosch
6f5b6b7916
linux/hardened/patches/5.10: 5.10.165-hardened1 -> 5.10.166-hardened1
2023-02-06 11:33:49 +01:00
Maximilian Bosch
56bbb13161
linux_latest-libre: 19027 -> 19044
2023-02-06 11:33:21 +01:00
Maximilian Bosch
db732d0bbe
linux: 6.1.9 -> 6.1.10
2023-02-06 11:32:57 +01:00
Maximilian Bosch
4b68d39f3d
linux: 5.4.230 -> 5.4.231
2023-02-06 11:32:44 +01:00
Maximilian Bosch
7b1db0858c
linux: 5.15.91 -> 5.15.92
2023-02-06 11:32:33 +01:00
Maximilian Bosch
27b622c925
linux: 5.10.166 -> 5.10.167
2023-02-06 11:32:21 +01:00
Maximilian Bosch
7ac11283d5
linux: 4.19.271 -> 4.19.272
2023-02-06 11:32:10 +01:00
Maximilian Bosch
7d7b4262cf
linux: 4.14.304 -> 4.14.305
2023-02-06 11:31:57 +01:00
Vladimír Čunát
555f300879
treewide: another round of gcc12 fixups
2023-02-05 15:29:43 +01:00
github-actions[bot]
cb231fb28d
Merge master into staging-next
2023-02-05 06:01:18 +00:00
Weijia Wang
09eedf849b
Merge pull request #214634 from r-ryantm/auto-update/libzbd
...
libzbd: 2.0.3 -> 2.0.4
2023-02-05 05:50:29 +01:00
Weijia Wang
3b4a3ee307
Merge pull request #214483 from r-ryantm/auto-update/ksmbd-tools
...
ksmbd-tools: 3.4.6 -> 3.4.7
2023-02-05 04:28:24 +01:00
R. Ryantm
9d78ea7286
libzbd: 2.0.3 -> 2.0.4
2023-02-04 23:02:18 +00:00
github-actions[bot]
33919d25f0
Merge master into staging-next
2023-02-04 12:01:24 +00:00
Vladimír Čunát
68b1727907
anbox, arc_unpacker: fix build after defaulting to gcc12
2023-02-04 12:36:34 +01:00
K900
9defd51f41
Merge pull request #214364 from K900/nvidia-kernel-deps-leak
...
nvidia_x11: don't leak the kernel reference into nvidia-settings
2023-02-04 13:25:33 +03:00
K900
858e9e36fb
nvidia_x11: don't leak the kernel reference into nvidia-settings
2023-02-04 13:23:44 +03:00
R. Ryantm
cb5e4c63c4
ksmbd-tools: 3.4.6 -> 3.4.7
2023-02-04 04:47:55 +00:00
github-actions[bot]
2e0f3bc57b
Merge master into staging-next
2023-02-04 00:02:11 +00:00
Masanori Misono
c1fd7598cf
bpftrace: 0.16.0 -> 0.17.0
2023-02-03 16:53:17 -06:00
superherointj
95642fb287
Merge pull request #210458 from NickCao/openssl3
...
various: unpin openssl_1_1
2023-02-03 19:27:21 -03:00
superherointj
f3b37396bd
Merge pull request #214265 from PedroHLC/bcachefs-2023-02-01
...
linux_testing_bcachefs: 6.1.9-unstable-2022-12-29 -> 6.1.3-unstable-2023-02-01
2023-02-03 19:03:44 -03:00
Vladimír Čunát
d0d8c15bad
Merge branch 'master' into staging-next
...
pkgs/development/web/nodejs/v18.nix conflict:
the fetched patch was already included in this release.
2023-02-03 23:02:19 +01:00
Artturi
ef2bbaad19
Merge pull request #212072 from r-ryantm/auto-update/libpsm2
2023-02-03 22:33:46 +02:00
Tyler Slabinski
ed9478f555
linuxPackages_testing: 6.2-rc2 -> 6.2-rc6
2023-02-03 19:27:15 +00:00
github-actions[bot]
41d7ce1517
Merge master into staging-next
2023-02-03 06:01:30 +00:00
Nick Cao
0cfdf4aa29
Merge pull request #214258 from superherointj/linuxPackages.lttng-modules-2.13.8
...
linuxPackages.lttng-modules: 2.13.4 -> 2.13.8
2023-02-03 10:07:08 +08:00
Nick Cao
c996c7572d
Merge pull request #214248 from superherointj/bump-linuxPackages.rtl8723ds-unstable-2022-12-01
...
linuxPackages.rtl8723ds: unstable-2022-10-20 -> unstable-2022-12-01
2023-02-03 10:02:26 +08:00
tobim
3cf2d77f64
linuxPackages.evdi: 1.12.0 -> 2022-10-13 ( #196198 )
...
* linuxPackages.evdi: 1.12.0 -> 2022-10-13
---------
Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com>
2023-02-02 22:07:54 -03:00
Nick Cao
95e13fbec7
Merge pull request #214254 from superherointj/linuxPackages.rtl8812au-unstable-2023-01-17
...
linuxPackages.rtl8812au: unstable-2022-08-22 -> unstable-2023-01-17
2023-02-03 09:05:12 +08:00
Nick Cao
2112aafa18
Merge pull request #214256 from superherointj/linuxPackages.rtl8821ce-unstable-2023-01-01
...
linuxPackages.rtl8821ce: unstable-2022-06-01 -> unstable-2023-01-01
2023-02-03 09:04:48 +08:00
superherointj
5e04ad9e66
Merge pull request #210892 from sielicki/ena280-281
...
linuxPackages.ena: 2.8.0 -> 2.8.2
2023-02-02 22:01:10 -03:00
github-actions[bot]
61687cbd42
Merge master into staging-next
2023-02-03 00:02:29 +00:00
PedroHLC ☭
64d752ea60
linuxKernel.kernels.linux_testing_bcachefs: add pedrohlc to maintainers
2023-02-02 20:29:59 -03:00
PedroHLC ☭
9c69938485
linuxKernel.kernels.linux_testing_bcachefs: 6.1.9-unstable-2022-12-29 -> 6.1.3-unstable-2023-02-01
2023-02-02 20:29:48 -03:00
Tyler Slabinski
f8f7820433
linuxPackages_testing: remove unused options for 6.2
2023-02-02 23:29:18 +00:00
superherointj
5cc9837bb5
linuxPackages.lttng-modules: 2.13.4 -> 2.13.8
2023-02-02 18:31:02 -03:00
superherointj
1ff7e41b03
linuxKernel.rtl8814au: unstable-2022-08-18 -> unstable-2022-11-09
...
Fixes Kernel 6.1
2023-02-02 18:28:16 -03:00
superherointj
35662dd7b6
linuxPackages.rtl8821ce: unstable-2022-06-01 -> unstable-2023-01-01
2023-02-02 18:04:08 -03:00
superherointj
82c93e2266
linuxPackages.rtl8812au: unstable-2022-08-22 -> unstable-2023-01-17
2023-02-02 17:52:31 -03:00
superherointj
2ca4096f7f
linuxPackages.rtl8723ds: unstable-2022-10-20 -> unstable-2022-12-01
2023-02-02 17:09:02 -03:00
superherointj
479bff9693
linuxPackages.rtl8189fs: 2022-05-20 -> 2022-10-30
2023-02-02 15:06:11 -03:00
github-actions[bot]
6d7be19afb
Merge master into staging-next
2023-02-02 18:01:08 +00:00
superherointj
695a83030f
Merge pull request #214208 from PedroHLC/zen-kernels-6.1.9
...
zen-kernels: 6.1.8 -> 6.1.9
2023-02-02 14:45:58 -03:00
Artturin
1db2422130
systemd: disallowedReferences nativeBuildInputs
...
add cross to passthru.tests to prevent cross breaking
2023-02-02 18:57:58 +02:00
Sandro
a9cadfb7b8
Merge pull request #213490 from OPNA2608/refactor/yaml-cpp
...
yaml-cpp*: Refactor, rename, adopt
2023-02-02 17:32:34 +01:00
PedroHLC ☭
e7d6bb28a1
linuxKernel.kernels.linux_zen: 6.1.8-zen1 -> 6.1.9-zen1
2023-02-02 13:15:53 -03:00
Artturin
2142bc8d33
systemd: don't reference build bash
...
the .install files retained references to build bash
$ pwd
/nix/store/yfzncfa577cbc0r1bm1fjdc1szyy0dif-systemd-aarch64-unknown-linux-gnu-252.4/lib
$ tree kernel
kernel
├── install.conf
└── install.d
├── 50-depmod.install
└── 90-loaderentry.install
2023-02-02 18:12:12 +02:00
PedroHLC ☭
001bb99794
linuxKernel.kernels.linux_lqx: 6.1.8-lqx1 -> 6.1.9-lqx1
2023-02-02 13:09:46 -03:00
R. Ryantm
66482fadd2
fscrypt-experimental: 0.3.3 -> 0.3.4
2023-02-02 12:58:45 +00:00
github-actions[bot]
2cc6469b1d
Merge master into staging-next
2023-02-02 00:02:33 +00:00
Bernardo Meurer
d8d7f22028
linux-rt_5_10: 5.10.162-rt78 -> 5.10.165-rt81
2023-02-01 12:02:37 -05:00
Bernardo Meurer
bafc851daf
linux: 6.1.8 -> 6.1.9
2023-02-01 12:02:11 -05:00
Bernardo Meurer
6ac29fe074
linux: 5.15.90 -> 5.15.91
2023-02-01 12:02:08 -05:00
Bernardo Meurer
6b4540341b
linux: 5.10.165 -> 5.10.166
2023-02-01 12:02:01 -05:00
Vladimír Čunát
9287f4461d
Merge #206907 : stdenv: gcc11 -> gcc12
2023-02-01 16:54:44 +01:00
github-actions[bot]
ba176ec75c
Merge staging-next into staging
2023-02-01 06:01:40 +00:00
Nick Cao
dfdb1a7329
Merge pull request #213861 from r-ryantm/auto-update/iotop-c
...
iotop-c: 1.22 -> 1.23
2023-02-01 11:44:28 +08:00
Nick Cao
ceaaabef46
Merge pull request #213805 from Luflosi/update/linuxPackages.apfs
...
linuxPackages.apfs: unstable-2022-10-20 -> 0.3.0
2023-02-01 09:39:04 +08:00
Thomas Gerbet
4567743bcb
busybox: 1.35.0 -> 1.36.0
...
Changes:
```
Aaro Koskinen:
devmem: add 128-bit width
Bernhard Reutner-Fischer (3):
kbuild: fix building sha256
kbuild: Prefer -Oz over -Os
seedrng: manually inline seed_rng
Brandon Maier:
xxd: fix typo in trivial usage
Dario Binacchi (2):
fbset: abort on not handled options
fbset: support setting pixel clock rate
David Leonard:
tsort: new applet
Denys Vlasenko:
Makefile.flags: add resolv to LDLIBS for linux compilers too (not only gnu ones)
build system: detect if build host has no bzip2
scripts/echo.c: fix NUL handling in "abc\0 def"
libbb/loop: fix compile failure (name collision)
libbb/loop: optionally use ioctl(LOOP_CONFIGURE) to set up loopdevs
libbb/loop: restore the correct return value of set_loop()
libbb/sha1: add config-selectable fully unrolled version, closes 14391
libbb/sha1: add config-selectable partially unrolled version
libbb/sha1: assembly versions for x86
libbb/sha1: optional x86 hardware accelerated hashing
libbb/sha256: optional x86 hardware accelerated hashing
libbb: change xstrndup, xmemdup to take size_t as size parameter
libbb: factor out fflush_stdout_and_exit(EXIT_SUCCESS)
libbb: fflush_stdout_and_exit(0) still exits with _error_ (not 0!) if fflush fails
libbb: fix fallout from nth_string() robustification, closes 14726
libbb: introduce and use chdir_or_warn()
libbb: invert the meaning of SETUP_ENV_NO_CHDIR -> SETUP_ENV_CHDIR
tls: P256: remove NOP macro sp_256_norm_8()
tls: include signature_algorithms extension in client hello message
examples/var_service/dhcp_if: make helper scripts more talkative
testsuite/mount.tests: accomodate umount failure seen on 5.18.0
testsuite/sha1sum.tests: fix false positive failure
shell: add comments about SIGINT-related problems
shell: fix compile failures in some configs
ash,hush: fix handling of SIGINT while waiting for interactive input
ash: ^C with SIG_INGed SIGINT should not exit the shell
ash: do not truncate failed tilde expansion on unknown user names
ash: fix ifs cleanup on error paths
ash: fix unsafe use of mempcpy
ash: fix use-after-free in pattern substitution code
awk: input numbers are never octal or hex (only program consts can be)
bc: hopefully fix bug 14956 (use-after-free)
cut: build fix for FEATURE_CUT_REGEX
ifplugd: split -a into -a and -A, latter disables upping in iface creation
init: do not set HOME
ls: implement ls -sh (human-readable allocated blocks)
md5/shaXsum: use FEATURE_COPYBUF_KB to size the buffer instead of fixed 4k
mv: fix error in !VERBOSE configs
nmeter: %[md] %[mw] - dirty file-backed pages, writeback pages
powertop: fix cpuid asm: ebx saving/restoring is properly done by gcc
sed: correctly handle 'w FILE' commands writing to the same file
sed: fix double-free in FEATURE_CLEAN_UP=y configs
sed: fix handling of escaped delimiters in s/// replacement
sed: fix handling of escaped delimiters in s/// search pattern, closes 14541
seedrng: chdir to the SEED_DIRECTORY - avoid concat_path_file's
seedrng: do not hash in a constant string, it's not adding entropy
seedrng: do not hash lengths, they are very predictable
seedrng: do not try to continue on unexpected errors (just exit)
seedrng: explain why we need locking and fsync'ing
seedrng: include file/dir names in error messages
seedrng: re-add fsync after unlink, and explain its purpose
seedrng: reduce MAX_SEED_LEN from 512 to 256
seedrng: remove redundant assignment
seedrng: remove unnecessary zero-filling of local variables
seedrng: restore error check on fsync
seedrng: simplify read_new_seed() to not have error return
seedrng: use more xfuncs where appropriate
shaNNNsum: accept one-space "HASH FILENAME" format for -c, closes 14866
sort: fix -k2M (wasn't skipping leading whitespace)
sort: fix -s -r interaction: 'stable' order is not affected by -r
sort: fix sort -s -u, closes 14871
sort: support -h
sulogin: increase util-linux compatibility
sulogin: start _login_ shell only with -p
sulogin: util-linux does not say "normal startup" on Ctrl-D
taskset: fix printf format mismatch in !FEATURE_TASKSET_FANCY config. closes 14616
top: fix display of large PID/PPID
top: improve large PID display in memory ('s') mode
tree: make it unicode-aware
tree: unicode tweak (use normal space char, 0x20)
udhcpc6: add missed big-endian conversions
udhcpc6: align FF02__1_2[]
udhcpc6: downgrade "opening listen socket" log level to 2
udhcpc6: fix binding to network aliases
udhcpc6: fix sending of renew messages
udhcpc6: use a different default config script
xargs: implement -o, closes 15146
xxd -r: handle offsets
xxd -r: without -p, stop at more than one whitespace, closes 14786
xxd: fix use of non-initialized data
xxd: use bb_simple_perror_msg... where appropriate
Emanuele Giacomelli:
XXXsum: handle binary sums with " " in the path
Grob Grobmann:
vi: add 'ZQ' quitting command
Henrique Rodrigues:
ping: fix typo in --help text
Jason A. Donenfeld (10):
seedrng: import SeedRNG utility for kernel RNG seed files
seedrng: use libbb functions
seedrng: hoist bb_strtoul out of min/max
seedrng: remove some global variables
seedrng: further reduce size
seedrng: use predefined strings where possible
seedrng: avoid needless runtime strlen() call
seedrng: compress format strings with %s arguments
seedrng: code-golf even smaller
seedrng: prune header includes
Khem Raj:
apply const trick to ptr_to_globals
Louis Sautier:
pkill: add -e to display the name and PID of the process being killed
Ludwig Nussel:
libbb: mark stack in assembly files read-only
Natanael Copa (2):
awk: fix use after free (CVE-2022-30065)
more: accept and ignore -e
Paul Fox:
crond: implement support for setting PATH in crontab files
Peter Kaestle:
unzip -l: add missed big-endian conversions date and time
Roger Knecht:
tree: new applet
Ron Yorston (8):
libbb: restore special handling of nomsg errors
libbb: make '--help' handling more consistent
lineedit: get PWD from ash
ash,hush: use HOME for tab completion and prompts
vi: fix regression in autoindent handling
vi: handle autoindent in 'cc' command
vi: improved handling of backspace in replace mode
vi: fix backspace over tab in commands
Samuel Thibault:
Fix non-Linux builds
Shawn Landden:
ash: optional sleep builtin
Sören Tempel (3):
ed: add support for -s command-line option as mandated by POSIX
ash: don't read past end of var in subvareval for bash substitutions
ash: fix use-after-free in bash pattern substitution
Timo Teräs:
mkfs.vfat: fix volume label to be padded with space
Vincent Stehlé:
fdisk: recognize EBBR protective partitions
Walter Lozano:
Add support for long options to cmp
Xiaoming Ni (4):
loop: fix a race when a free loop device is snatched
loop: refactor: extract subfunction get_next_free_loop()
loop: simplify code of LOOP_SET_FD failure
loop: refactor: extract subfunction set_loopdev_params()
```
2023-02-01 00:34:42 +00:00
Mario Rodas
e5e2646a07
Merge pull request #213790 from SuperSandro2000/sysdig-lib
...
sysdig: remove with lib over entire file
2023-01-31 19:17:46 -05:00
github-actions[bot]
1ae6b7c963
Merge staging-next into staging
2023-02-01 00:03:12 +00:00
R. Ryantm
95bf8681e1
iotop-c: 1.22 -> 1.23
2023-01-31 22:18:00 +00:00
Alyssa Ross
a997c219d8
libsmbios: add musl patch
...
Upstream seems pretty dead, so I think a patch is the best we're going
to get here. But on the other hand, that means the package isn't
likely to require a lot of maintenance that could be made more
difficult by having a patch around.
2023-01-31 20:44:59 +00:00
github-actions[bot]
9f7ab547e6
Merge staging-next into staging
2023-01-31 18:02:01 +00:00
Luflosi
eaf43be84c
linuxPackages.apfs: unstable-2022-10-20 -> 0.3.0
...
https://github.com/linux-apfs/linux-apfs-rw/releases/tag/v0.3.0
I also added a `longDescription` and modified the test to verify the checksum on all metadata nodes now that it works.
2023-01-31 17:35:05 +01:00
OPNA2608
c9b4c7dccd
treewide: Rename libyamlcpp* to yaml-cpp*
2023-01-31 16:22:54 +01:00
Sandro Jäckel
6dbf077be2
sysdig: remove with lib over entire file
2023-01-31 15:06:57 +01:00
Weijia Wang
5f83b5d199
Merge pull request #208801 from LeSuisse/multipath-tools-0.9.4
...
multipath-tools: 0.9.3 -> 0.9.4
2023-01-31 14:57:49 +01:00
Artturi
d289affac3
Merge pull request #213609 from lschuermann/dev/criu-cross-compile
2023-01-31 14:12:40 +02:00
github-actions[bot]
6527aa6d68
Merge staging-next into staging
2023-01-31 12:01:45 +00:00
Leon Schuermann
f9a1d83cdb
criu: support cross-compile for armv7l and aarch64
...
This fixes the `criu` package to support cross-compilation to armv7l
and aarch64 architectures (tested on an x86 build host). `criu`
requires some additional flags to be passed to its Makefile
infrastructure to hint at the target architecture. It further requires
a few dependencies to be executed on the build host, hence moving them
to `depsBuildBuild`.
Signed-off-by: Leon Schuermann <leon@is.currently.online>
2023-01-31 13:18:13 +02:00
Vladimír Čunát
e4957a85c9
Merge #211923 : staging-next 2023-01-21
2023-01-31 09:42:28 +01:00
Nick Cao
13ac55a095
Merge pull request #213420 from MGlolenstine/picoprobe-udev-rules
...
picoprobe-udev-rules: init at 0.0.1
2023-01-31 14:47:12 +08:00
MGlolenstine
ac64ad4c5a
picoprobe-udev-rules: init at unstable-2023-01-31
2023-01-31 06:55:55 +01:00
Nicholas Sielicki
33397faec9
ena: 2.8.0 -> 2.8.2
...
* Notably, fixes build on kernel >= 5.17
Signed-off-by: Nicholas Sielicki <git@opensource.nslick.com>
2023-01-31 03:31:05 +00:00
github-actions[bot]
33d4318fcc
Merge staging-next into staging
2023-01-31 00:03:07 +00:00
github-actions[bot]
dd1ff149da
Merge master into staging-next
2023-01-31 00:02:31 +00:00
Florian Klink
31931ffc35
Merge pull request #212939 from amjoseph-nixpkgs/pr/isStatic
...
meta: replace predicates with pattern over elaborated platform
2023-01-30 21:13:15 +01:00
Alyssa Ross
0da24fa3ba
systemd: disable BPF for ARMv5
...
ARMv5 does not have hardware floating point, so can't build systemd's
BPF code.
2023-01-30 19:54:13 +00:00
Florian Klink
b9edd43573
Merge pull request #213442 from gdamjan/staging/systemd-252.5
...
systemd: 252.4 -> 252.5
2023-01-30 18:14:17 +01:00
github-actions[bot]
645af55243
Merge staging-next into staging
2023-01-30 12:01:57 +00:00
github-actions[bot]
1a06f52c21
Merge master into staging-next
2023-01-30 12:01:22 +00:00
Nick Cao
77a77721cd
Merge pull request #212970 from R-VdP/fwupd_1_8_10
...
fwupd: 1.8.9 -> 1.8.10
2023-01-30 14:37:13 +08:00
github-actions[bot]
7ea63a1440
Merge staging-next into staging
2023-01-30 06:01:52 +00:00
github-actions[bot]
90a6b7bb33
Merge master into staging-next
2023-01-30 06:01:14 +00:00
Дамјан Георгиевски
196ce76703
systemd: 252.4 -> 252.5
...
https://github.com/systemd/systemd-stable/compare/v252.4...v252.5
Commits: 81
Files changed: 103
2023-01-29 21:47:18 +01:00
Sergei Trofimovich
32b89d8c5f
pax-utils: 1.3.6 -> 1.3.7
...
Changes: https://github.com/gentoo/pax-utils/compare/v1.3.6...v1.3.7
2023-01-29 18:40:56 +00:00
github-actions[bot]
e043f89f93
Merge staging-next into staging
2023-01-29 12:01:54 +00:00
github-actions[bot]
2019d6632b
Merge master into staging-next
2023-01-29 12:01:20 +00:00
Alyssa Ross
6fe87d1586
linuxPackages.perf: only use systemtap where available
...
Fixes pkgsMusl.perf.
2023-01-29 10:50:11 +00:00
github-actions[bot]
fd893034cb
Merge staging-next into staging
2023-01-29 06:01:55 +00:00
github-actions[bot]
04f965695c
Merge master into staging-next
2023-01-29 06:01:23 +00:00
Weijia Wang
4f10ebbd5c
Merge pull request #213011 from Mic92/kernel.org
...
treewide: use more secure and proxy friendly https protocol to fetch …
2023-01-29 06:34:25 +01:00
github-actions[bot]
1b9455b894
Merge staging-next into staging
2023-01-29 00:03:07 +00:00
github-actions[bot]
d7f991bb53
Merge master into staging-next
2023-01-29 00:02:27 +00:00
R. Ryantm
edc8e8e141
health-check: 0.03.10 -> 0.03.11
2023-01-28 19:25:06 +00:00
Martin Weinelt
4da94024e8
Merge pull request #197911 from r-ryantm/auto-update/alsa-lib
...
alsa-lib: 1.2.7.2 -> 1.2.8
2023-01-28 19:06:18 +00:00
Sergei Trofimovich
f3355e39f6
Merge pull request #183972 from r-ryantm/auto-update/alsa-ucm-conf
...
alsa-ucm-conf: 1.2.7.1 -> 1.2.8
2023-01-28 18:54:09 +00:00
Fabián Heredia Montiel
0cf5d85f0c
treewide: add gcc12 flags
2023-01-27 21:20:52 -06:00
Fabián Heredia Montiel
713db8d8f8
linux/hardened: make GCC_STRUCTLEAK optional since it isn't an option
...
with GCC 12
2023-01-27 21:20:51 -06:00
github-actions[bot]
0f14755608
Merge staging-next into staging
2023-01-28 00:02:51 +00:00
github-actions[bot]
c7c5d670a2
Merge master into staging-next
2023-01-28 00:02:20 +00:00
Martin Weinelt
c458f07bac
Merge pull request #213040 from r-ryantm/auto-update/powerstat
...
powerstat: 0.02.27 -> 0.03.00
2023-01-27 23:08:18 +00:00
Martin Weinelt
4d96ea81a4
Merge remote-tracking branch 'origin/staging-next' into staging
2023-01-27 23:50:50 +01:00
Martin Weinelt
52029b8e00
Merge remote-tracking branch 'origin/master' into staging-next
2023-01-27 23:50:36 +01:00
R. Ryantm
b55e98200e
powerstat: 0.02.27 -> 0.03.00
2023-01-27 22:46:51 +00:00
Jörg Thalheim
b0ccd1d737
treewide: use more secure and proxy friendly https protocol to fetch from git.kernel.org
2023-01-27 21:11:39 +01:00
Martin Weinelt
17f3a14ad8
Merge pull request #212872 from mweinelt/jool-4.1.9
...
jool: 4.1.8 -> 4.1.9
2023-01-27 19:34:44 +00:00
github-actions[bot]
99e30309e5
Merge staging-next into staging
2023-01-27 18:02:07 +00:00
github-actions[bot]
8291dfb1b4
Merge master into staging-next
2023-01-27 18:01:31 +00:00
R-VdP
d0a7702b8f
fwupd: thunderbolt plugin only enabled upstream for x86.
2023-01-27 17:42:20 +01:00
R-VdP
801d887751
fwupd: 1.8.9 -> 1.8.10
2023-01-27 15:46:06 +01:00
Robin Appelman
4b22cf45b4
fanctl: init at 0.6.4
2023-01-27 13:07:50 +01:00
github-actions[bot]
e11b11e738
Merge staging-next into staging
2023-01-27 12:01:56 +00:00
github-actions[bot]
92b7725154
Merge master into staging-next
2023-01-27 12:01:22 +00:00
Weijia Wang
1045d60ea1
Merge pull request #211038 from r-ryantm/auto-update/forkstat
...
forkstat: 0.02.17 -> 0.03.00
2023-01-27 12:23:53 +01:00
Adam Joseph
a94114e70a
systemd: use non-function pattern for badPlatforms
...
Closes #212925
2023-01-27 02:21:43 -08:00
Nick Cao
eb8db23f75
Merge pull request #212928 from GTrunSec/vulkan_beta
...
linuxPackages.nvidia_x11_vulkan_beta: 515.47.04 -> 525.47.06
2023-01-27 18:06:10 +08:00
guangtao
b7ac519c9e
linuxPackages.nvidia_x11_vulkan_beta: 515.47.04 -> 525.47.06
2023-01-27 01:46:31 -08:00
Michal Sojka
43e8c1c5b6
trace-cmd: 3.1.2 -> 3.1.6
2023-01-27 09:43:22 +00:00
Michal Sojka
5fd479d50b
libtracefs: 1.5.0 -> 1.6.4
...
trace-cmd 3.1.6 needs at least version 1.6.
2023-01-27 09:43:22 +00:00
Vladimír Čunát
8a77ed60ac
Merge branch 'master' into staging-next
2023-01-27 09:36:55 +01:00
Laszlo Gombos
6cb088fa68
dracut: fix homepage
2023-01-27 04:29:46 +00:00
Martin Weinelt
83322be383
jool: 4.1.8 -> 4.1.9
...
https://mail-lists.nic.mx/pipermail/jool-list/2023-January/000479.html
2023-01-27 02:05:32 +01:00
github-actions[bot]
03e9b9c92c
Merge staging-next into staging
2023-01-26 18:02:05 +00:00
github-actions[bot]
578f1ba854
Merge master into staging-next
2023-01-26 18:01:29 +00:00
Thiago Kenji Okada
28b7f1c26c
Merge pull request #212741 from PedroHLC/zen-kernels-6.1.8
...
zen-kernels: 6.1.6 -> 6.1.8
2023-01-26 14:18:45 +00:00
Jacek Galowicz
3e090d53d4
Merge pull request #212634 from blitz/ax99100
...
linuxPackages.ax99100: fix build on newer kernels
2023-01-26 15:12:36 +01:00
github-actions[bot]
1337f7ba23
Merge staging-next into staging
2023-01-26 12:01:59 +00:00
github-actions[bot]
636db670cc
Merge master into staging-next
2023-01-26 12:01:24 +00:00
PedroHLC ☭
479cf72e9f
linuxKernel.kernels.linux_lqx: 6.1.6-lqx1 -> 6.1.8-lqx1
2023-01-26 06:32:09 -03:00
PedroHLC ☭
d9a4a546b0
linuxKernel.kernels.linux_zen: 6.1.6-zen1 -> 6.1.8-zen1
2023-01-26 06:29:23 -03:00
Cole Helbling
e80e2cde7d
zfs: 2.1.8 -> 2.1.9
2023-01-25 14:44:44 -08:00
Julian Stecklina
7e9f022808
linuxPackages.ax99100: fix build on newer kernels
2023-01-25 21:22:55 +01:00
github-actions[bot]
0a0068baab
Merge staging-next into staging
2023-01-25 18:01:57 +00:00
github-actions[bot]
a1c257a1c6
Merge master into staging-next
2023-01-25 18:01:20 +00:00
K900
c015bb7dd9
Merge pull request #212565 from Ma27/linux-kernel-updates
...
Linux kernel updates 2022-01-25
2023-01-25 16:40:57 +03:00
github-actions[bot]
588d9ab6e2
Merge staging-next into staging
2023-01-25 12:02:09 +00:00
github-actions[bot]
20df8d00cc
Merge master into staging-next
2023-01-25 12:01:34 +00:00
Jonas Heinrich
5ca9d14952
Merge pull request #212215 from samueldr/fix/waydroid-deps
...
waydroid: Add missing ambiant dependencies
2023-01-25 11:07:05 +01:00
Maximilian Bosch
0c5d652c65
linux/hardened/patches/6.1: 6.1.7-hardened1 -> 6.1.8-hardened1
2023-01-25 10:45:36 +01:00
Maximilian Bosch
664dec6fff
linux/hardened/patches/5.4: 5.4.229-hardened1 -> 5.4.230-hardened1
2023-01-25 10:45:22 +01:00
Maximilian Bosch
d2cecf2811
linux/hardened/patches/5.15: 5.15.89-hardened1 -> 5.15.90-hardened1
2023-01-25 10:45:11 +01:00
Maximilian Bosch
979280a84f
linux/hardened/patches/5.10: 5.10.164-hardened1 -> 5.10.165-hardened1
2023-01-25 10:44:58 +01:00
Maximilian Bosch
51e2e1886f
linux/hardened/patches/4.19: 4.19.270-hardened1 -> 4.19.271-hardened1
2023-01-25 10:44:45 +01:00
Maximilian Bosch
c528f77d29
linux/hardened/patches/4.14: 4.14.303-hardened1 -> 4.14.304-hardened1
2023-01-25 10:44:35 +01:00
Maximilian Bosch
f638ef65cd
linux: 6.1.7 -> 6.1.8
2023-01-25 10:43:53 +01:00
Maximilian Bosch
973d29d69e
linux: 5.4.229 -> 5.4.230
2023-01-25 10:43:41 +01:00
Maximilian Bosch
795dd11c54
linux: 5.15.89 -> 5.15.90
2023-01-25 10:43:31 +01:00
Maximilian Bosch
c6851f531e
linux: 5.10.164 -> 5.10.165
2023-01-25 10:43:20 +01:00
Maximilian Bosch
f9b2f16602
linux: 4.19.270 -> 4.19.271
2023-01-25 10:43:09 +01:00
Maximilian Bosch
633c9d1160
linux: 4.14.303 -> 4.14.304
2023-01-25 10:42:59 +01:00
github-actions[bot]
3c67941102
Merge staging-next into staging
2023-01-25 06:01:39 +00:00
github-actions[bot]
a2f216a003
Merge master into staging-next
2023-01-25 06:01:06 +00:00
Nick Cao
ecc9592264
Merge pull request #212400 from r-ryantm/auto-update/rasdaemon
...
rasdaemon: 0.6.8 -> 0.7.0
2023-01-25 12:19:03 +08:00
github-actions[bot]
c471a30584
Merge staging-next into staging
2023-01-25 00:02:54 +00:00
github-actions[bot]
c47e4b69a3
Merge master into staging-next
2023-01-25 00:02:20 +00:00