From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 43E8AB01A; Fri, 26 Jun 2026 18:55:43 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 2D6B3AFBB; Fri, 26 Jun 2026 18:55:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-43171.protonmail.ch (mail-43171.protonmail.ch [185.70.43.171]) by atuin.qyliss.net (Postfix) with ESMTPS id B6B00AF77 for ; Fri, 26 Jun 2026 18:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colbyt.com; s=protonmail; t=1782500139; x=1782759339; bh=VNbm9FIvDu1s4SBbFtuoH4aXVgCCuyYcdh9+oNOs9Sk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=A6YSN8OvXYhqFPFDV2a0ZaDtj21r0WmWuc0Ue36ClKdtsg72bUhjB7gQU+VpWnXNB DRGP2KRSL1S3KuUjk2YVXktDV6vMHLg9p9jUpJQVYY3BtKx5SNbwoXeCupUZdBfhZZ 5GXkKGo3+Yony7DBaXeCQgdVWZLTmdHwpVgOIrQVKyDToQ1gU7p2/DOoiR84/zP4B9 onnyPdq9VQ03NkfLkAY971A4JzVpG0wNTKNUvZ42Le1jT54hHsct1+8kEpaoMrWyYs zT8Nd+sN2LWevtS4vIdm3G8vRbyJimhj3MxWVfsQ3x3JHzZvP0QWsd9GIt7BJm1bX7 hgP4EzEUrA9GQ== X-Pm-Submission-Id: 4gn4cn32Bzz2Sd34 From: colbyt To: devel@spectrum-os.org Subject: [PATCH optional] linux: use 6.18 for generic images Date: Fri, 26 Jun 2026 11:55:09 -0700 Message-ID: <20260626185509.3715326-10-colby@colbyt.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: VREOOOJYBHDYXBVK2SOIQ5BVTVUC2ICS X-Message-ID-Hash: VREOOOJYBHDYXBVK2SOIQ5BVTVUC2ICS X-MailFrom: colby@colbyt.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: colbyt X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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