diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-16 18:00:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-16 18:00:57 +0000 |
commit | feedc73bee3d3f83b85d36c91f4bd4ff16fcfe43 (patch) | |
tree | dc2119ca420481a2e6072eea0f98a818de5be579 /pkgs/os-specific | |
parent | 736d06d6cfefaba0cf6e1c69b1b111d65d12dd4a (diff) | |
parent | 4a04be9a3cb62d6e6f70d08b34a04b7890ba2084 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/zen-kernels.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index c72be801aeeae..ffeb82d9b41bf 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -159,6 +159,8 @@ stdenv.mkDerivation rec { doCheck = false; # tries to access the net + passthru.shellPath = "/bin/ash"; + meta = with lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 7c4adba2efcf2..1f36e36c2335e 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.8.4"; #zen + version = "6.8.6"; #zen suffix = "zen1"; #zen - sha256 = "0cbcij31gar4is5zcrl748ijn91jly74i2gggf43ndh8yrzdni85"; #zen + sha256 = "09233xbvkwjd8yglzjh50pbw5n3pk7d8l5pb270ric9rnnl383jn"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.8.4"; #lqx - suffix = "lqx1"; #lqx - sha256 = "1hv9hvx9nw51qki5wbhm4dgyvgw7jjwxl8fvslaazn3r0rqch7z2"; #lqx + version = "6.8.6"; #lqx + suffix = "lqx2"; #lqx + sha256 = "0mxbl0h8s021m0ab12yy778qyhdlb5789qjbn66l8qxsw0dv4ags"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { |