movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-05-16 12:07:21 +00:00 • committed by GitHub
commit e6481721c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 7753 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -160,6 +160,7 @@
./programs/arp-scan.nix
./programs/atop.nix
./programs/ausweisapp.nix
./programs/autoenv.nix
./programs/autojump.nix
./programs/bandwhich.nix
./programs/bash-my-aws.nix

1
nixos/modules/programs/nm-applet.nix
View file

@ -28,6 +28,7 @@
description = "Network manager applet";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";
};

10
nixos/modules/services/web-apps/kimai.nix
View file

@ -324,12 +324,14 @@ in
${pkg hostName cfg}/bin/console lint:yaml --parse-tags \
${pkg hostName cfg}/share/php/kimai/config
# Run kimai:install to ensure database is created or updated.
# Before running any further console commands, clear cache. This
# avoids errors due to old cache getting used with new version
# of Kimai.
${pkg hostName cfg}/bin/console cache:clear --env=prod
# Then, run kimai:install to ensure database is created or updated.
# Note that kimai:update is an alias to kimai:install.
${pkg hostName cfg}/bin/console kimai:install --no-cache
# Clear cache and warmup cache separately, to avoid "Cannot declare
# class App\Entity\Timesheet" error on first init after upgrade.
${pkg hostName cfg}/bin/console cache:clear --env=prod
# Finally, warm up cache.
${pkg hostName cfg}/bin/console cache:warmup --env=prod
'';