From c96bce297517b32b3c69e3928109642048ee8b40 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 30 Jun 2024 14:15:30 +0200 Subject: [PATCH] fix: pin kernel to 6.7.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.7.6, 6.7.7 are not working for unknown reasons even though a previous NixOS stable 23.11 revision with 6.7.7 worked… Let's keep it that way for now, pending bisection between 6.7.5..6.7.6. Signed-off-by: Raito Bezarius --- flake.lock | 8 ++++---- flake.nix | 4 ++-- hosts/epyc.nix | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7da0e69..061d91c 100644 --- a/flake.lock +++ b/flake.lock @@ -304,17 +304,17 @@ }, "nixpkgs-for-kernel": { "locked": { - "lastModified": 1709742294, - "narHash": "sha256-8iPomMqw7grXVsugMJhsnHdbre8LnXOQUtHtMXRaWqc=", + "lastModified": 1708680708, + "narHash": "sha256-K2SxCGk13nLOFMeNG1RjzFDrh513VtzFzFhp0NsnJRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90", + "rev": "593000b7d1e21cd84c7ecd965a64916b0982b202", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90", + "rev": "593000b7d1e21cd84c7ecd965a64916b0982b202", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2b4a8f9..1df1785 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,8 @@ flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - # contains kernel 6.7.7, do not update - nixpkgs-for-kernel.url = "github:NixOS/nixpkgs/56051fbe049bf39adc1f08eb51740c226a4c3b90"; + # contains kernel 6.7.5, do not update + nixpkgs-for-kernel.url = "github:NixOS/nixpkgs/593000b7d1e21cd84c7ecd965a64916b0982b202"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nur.url = "github:nix-community/NUR"; diff --git a/hosts/epyc.nix b/hosts/epyc.nix index eb9e483..3c48294 100644 --- a/hosts/epyc.nix +++ b/hosts/epyc.nix @@ -1,7 +1,10 @@ { inputs, lib, pkgs, ... }: let gcc-system-features = arch: lib.optionals (arch != null) ([ "gccarch-${arch}" ] - ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch}); + ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch}); + pkgsForKernel = import inputs.nixpkgs-for-kernel { + system = "x86_64-linux"; + }; in { imports = [ @@ -28,11 +31,7 @@ in # TODO: there's a critical bug on 6.8+ where btrfs won't mount the rootfs at all. # Do not upgrade until it is fixed. Ping Raito when needed. - boot.kernelPackages = let - pkgsForKernel = import inputs.nixpkgs-for-kernel { - system = "x86_64-linux"; - }; - in pkgsForKernel.linuxPackages_6_7; + boot.kernelPackages = pkgsForKernel.linuxPackages_6_7; # Open public access to our PostgreSQL. services.postgresql.enable = true;