colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2025-07-28 -> 2025-07-30

Browse Source
This commit is contained in:
Colin
2025-07-30 18:16:15 +00:00
parent 0b54c31b0c
commit c5a574fe6a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/common/systemd.nix
View File

@@ -4,7 +4,7 @@ let
# a timeout of 20s is actually closer to 70s, # a timeout of 20s is actually closer to 70s,
# because it allows 20s, then after the 20s passes decides to allow 40s, then 60s, # because it allows 20s, then after the 20s passes decides to allow 40s, then 60s,
# finally it peacefully kills stuff, and then 10s later actually kills shit. # finally it peacefully kills stuff, and then 10s later actually kills shit.
haltTimeout = 10; haltTimeoutSec = 10;
in in
{ {
# sane.persist.sys.byStore.ephemeral = [ # sane.persist.sys.byStore.ephemeral = [
@@ -125,10 +125,10 @@ in
TAG=="uaccess" GROUP="plugdev" TAG=="uaccess" GROUP="plugdev"
''; '';
systemd.extraConfig = '' systemd.settings.Manager = {
# DefaultTimeoutStopSec defaults to 90s, and frequently blocks overall system shutdown. # DefaultTimeoutStopSec defaults to 90s, and frequently blocks overall system shutdown.
DefaultTimeoutStopSec=${builtins.toString haltTimeout} DefaultTimeoutStopSec = "${builtins.toString haltTimeoutSec}s";
''; };
# fixes "Cannot open access to console, the root account is locked" on systemd init failure. # fixes "Cannot open access to console, the root account is locked" on systemd init failure.
# see: <https://github.com/systemd/systemd/commit/33eb44fe4a8d7971b5614bc4c2d90f8d91cce66c> # see: <https://github.com/systemd/systemd/commit/33eb44fe4a8d7971b5614bc4c2d90f8d91cce66c>

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "a79973d8b468a486abd2ad5b6917cb51946cffa8"; rev = "e2ba7bda3c3c79b7c919e1da0180d2cf6e18be43";
sha256 = "sha256-Qd/iXBiLowbG6gTODvCRVxpvWUkuxs0qBNusx81TYdc="; sha256 = "sha256-8XYVI0lVwgaH9uc7FOWOTOyGyT/D554Ra5L2I+Q6P48=";
version = "unstable-2025-07-28"; version = "unstable-2025-07-30";
branch = "master"; branch = "master";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "2b45ee524e6299160fb64167313690ae11009afc"; rev = "1433036fd04effcdfb653033bd93461200ffb110";
sha256 = "sha256-CiYhgWDUG6TF1gHo7hf309KnMNzlU5Y8m6pU/4PPFMI="; sha256 = "sha256-4mPb6o8uWlVdAchtkcF81gjJbQFuCZTz2s/n8neYLx8=";
version = "unstable-2025-07-28"; version = "unstable-2025-07-30";
branch = "staging-next"; branch = "staging-next";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "b72dfdf5d87e1ad9a8982d9ccc77abffb6e177fb"; rev = "19bf469f62460a6a696d134ed00f5e049301f43b";
sha256 = "sha256-ZYz2mvyIlsjqPNvzp10sGM+7figA//6roaj6ugotRDU="; sha256 = "sha256-I1RSTJGanBFqKwW4cDhj697NikTUghxRoD5EgCkMK+A=";
version = "unstable-2025-07-27"; version = "unstable-2025-07-30";
branch = "staging"; branch = "staging";
} }

2
pkgs/linux-packages/rk818-charger/rk818_battery.c
View File

@@ -1385,7 +1385,7 @@ static void rk818_bat_init_coffset(struct rk818_battery *di)
static void rk818_bat_caltimer_isr(struct timer_list *t) static void rk818_bat_caltimer_isr(struct timer_list *t)
{ {
struct rk818_battery *di = from_timer(di, t, caltimer); struct rk818_battery *di = timer_container_of(di, t, caltimer);
mod_timer(&di->caltimer, jiffies + MINUTE(8) * HZ); mod_timer(&di->caltimer, jiffies + MINUTE(8) * HZ);
queue_delayed_work(di->bat_monitor_wq, &di->calib_delay_work, queue_delayed_work(di->bat_monitor_wq, &di->calib_delay_work,