patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: colbyt <colby@colbyt.com>
To: devel@spectrum-os.org
Cc: colbyt <colby@colbyt.com>
Subject: [PATCH optional] linux: use 6.18 for generic images
Date: Fri, 26 Jun 2026 11:55:09 -0700	[thread overview]
Message-ID: <20260626185509.3715326-10-colby@colbyt.com> (raw)
In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com>

Keep the generic rootfs, app VM, net VM, and installer on the linux_6_18
package set after updating nixpkgs.

This is an optional conservative variant for deployments that should stay
on the Linux 6.18 LTS line instead of following linux_latest to Linux
7.1.1. With the new nixpkgs pin, that keeps the LTS track while updating
from Linux 6.18.2 to Linux 6.18.36.

Tested with the full integration suite on Linux 6.18.36.

Signed-off-by: colbyt <colby@colbyt.com>
---
 host/rootfs/default.nix             | 4 ++--
 img/app/default.nix                 | 4 ++--
 release/installer/configuration.nix | 2 +-
 vm/sys/net/default.nix              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index 6bfeefb..334f5de 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -4,7 +4,7 @@
 
 import ../../lib/call-package.nix (
 { callSpectrumPackage, config, spectrum-build-tools
-, src, pkgsMusl, inkscape, linuxPackagesFor, linux_latest, xorg
+, src, pkgsMusl, inkscape, linuxPackagesFor, linux_6_18, xorg
 }:
 pkgsMusl.callPackage (
 
@@ -51,7 +51,7 @@ let
     system.stateVersion = trivial.release;
   });
 
-  kernel = linux_latest;
+  kernel = linux_6_18;
 
   appvm = callSpectrumPackage ../../img/app { inherit (foot) terminfo; };
   netvm = callSpectrumPackage ../../vm/sys/net { inherit (foot) terminfo; };
diff --git a/img/app/default.nix b/img/app/default.nix
index 71e6fa0..72d618b 100644
--- a/img/app/default.nix
+++ b/img/app/default.nix
@@ -5,7 +5,7 @@ import ../../lib/call-package.nix (
 { spectrum-app-tools, spectrum-build-tools, src, terminfo
 , lib, appimageTools, buildFHSEnv, runCommand, stdenvNoCC, writeClosure
 , erofs-utils, jq, s6-rc, util-linux, xorg
-, cacert, linux_latest
+, cacert, linux_6_18
 }:
 
 let
@@ -21,7 +21,7 @@ let
     else
       stdenvNoCC.hostPlatform.linux-kernel.target;
 
-  kernel = (linux_latest.override {
+  kernel = (linux_6_18.override {
     structuredExtraConfig = with lib.kernel; {
       DRM_FBDEV_EMULATION = lib.mkForce no;
       EROFS_FS = yes;
diff --git a/release/installer/configuration.nix b/release/installer/configuration.nix
index 3f9ef24..415e5e9 100644
--- a/release/installer/configuration.nix
+++ b/release/installer/configuration.nix
@@ -14,7 +14,7 @@ in
   boot.kernelParams = [ "udev.log_priority=5" ];
   boot.initrd.verbose = false;
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_18;
 
   boot.plymouth.enable = true;
   boot.plymouth.logo = pkgs.callPackage (
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix
index a722b02..fc7885e 100644
--- a/vm/sys/net/default.nix
+++ b/vm/sys/net/default.nix
@@ -7,7 +7,7 @@ pkgsMusl.callPackage (
 
 { lib, stdenvNoCC, nixos, runCommand, writeClosure
 , erofs-utils, jq, s6-rc, util-linux, xorg
-, busybox, dbus, execline, iwd, kmod, linuxPackagesFor, linux_latest
+, busybox, dbus, execline, iwd, kmod, linuxPackagesFor, linux_6_18
 , mdevd, nftables, s6, s6-linux-init, spectrum-driver-tools, xdp-tools
 }:
 
@@ -27,7 +27,7 @@ let
     else
       stdenvNoCC.hostPlatform.linux-kernel.target;
 
-  kernel = (linux_latest.override {
+  kernel = (linux_6_18.override {
     structuredExtraConfig = with lib.kernel; {
       DRM_FBDEV_EMULATION = lib.mkForce no;
       EROFS_FS = yes;
-- 
2.54.0


  parent reply	other threads:[~2026-06-26 18:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-26 18:55 [PATCH 0/8] refresh nixpkgs for Linux 7.1 colbyt
2026-06-26 18:55 ` [PATCH 1/8] pkgs: fix aarch64-musl builds with current nixpkgs colbyt
2026-07-02 12:18   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 2/8] lib: update nixpkgs colbyt
2026-06-26 18:55 ` [PATCH 3/8] pkgs/skaware: vendor backported patches colbyt
2026-07-02 11:53   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 4/8] pkgs/gtk3: skip integrated Wayland backport colbyt
2026-07-02 12:19   ` Alyssa Ross
2026-06-26 18:55 ` [PATCH 5/8] pkgs/skaware: skip integrated backports colbyt
2026-06-26 18:55 ` [PATCH 6/8] pkgs/cloud-hypervisor: update GPU patchset to v52 colbyt
2026-06-26 18:55 ` [PATCH 7/8] pkgs/libfyaml: fix pkg-config libs colbyt
2026-06-26 18:55 ` [PATCH 8/8] vm-lib: allow app VMs to name closure roots colbyt
2026-07-02 13:38   ` Alyssa Ross
2026-07-02 23:40     ` colby
2026-07-03 14:02       ` Alyssa Ross
2026-06-26 18:55 ` colbyt [this message]
2026-07-02 13:42   ` [PATCH optional] linux: use 6.18 for generic images Alyssa Ross
2026-07-02 23:20     ` colby
2026-07-02 12:03 ` [PATCH 0/8] refresh nixpkgs for Linux 7.1 Alyssa Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260626185509.3715326-10-colby@colbyt.com \
    --to=colby@colbyt.com \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).