From f99fa54d6041310663661aa5ed5ef96efe7abd54 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 21 May 2026 20:31:54 -0400 Subject: [PATCH] Revert "Update only the kernel." This reverts commit d52b5db39bbd7570f660180327b647fa2d1030e7. --- nix/configuration/flake.lock | 19 +------------------ nix/configuration/flake.nix | 3 --- .../roles/optimized_build/default.nix | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index f3d37ad..a16b723 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -178,22 +178,6 @@ "type": "github" } }, - "nixpkgs-kernel": { - "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -242,8 +226,7 @@ "disko": "disko", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs", - "nixpkgs-kernel": "nixpkgs-kernel" + "nixpkgs": "nixpkgs" } }, "rust-overlay": { diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 4b85e53..8be7c10 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -20,7 +20,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-kernel.url = "github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; @@ -35,7 +34,6 @@ { self, nixpkgs, - nixpkgs-kernel, disko, impermanence, lanzaboote, @@ -88,7 +86,6 @@ nixpkgs.hostPlatform.system = nodeConfig.system; nixpkgs.overlays = [ (final: prev: { - kernel = nixpkgs-kernel.legacyPackages."${prev.stdenv.hostPlatform.system}"; # stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}"; unoptimized = import nixpkgs { system = prev.stdenv.hostPlatform.system; diff --git a/nix/configuration/roles/optimized_build/default.nix b/nix/configuration/roles/optimized_build/default.nix index 8c536a3..3fc944d 100644 --- a/nix/configuration/roles/optimized_build/default.nix +++ b/nix/configuration/roles/optimized_build/default.nix @@ -97,7 +97,7 @@ HZ = lib.kernel.freeform "300"; HZ_300 = lib.kernel.yes; HZ_1000 = lib.kernel.no; - } final.kernel.linux_6_18; # or prev.linux + } prev.linux_6_18; # or prev.linux } ) (final: prev: {