1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-07 11:05:30 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-03-07 00:02:41 +00:00 committed by GitHub
commit fa94414f70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 349 additions and 506 deletions

View file

@ -142,6 +142,7 @@ in
# convert remainings logs and start eventually
atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''
set -e -u
shopt -s nullglob
for logfile in "$LOGPATH"/atop_*
do
${atop}/bin/atopconvert "$logfile" "$logfile".new