From 1044aa16b03e4a63d9663cc36fb655d9cf94f28d Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 4 May 2025 12:09:57 -0400 Subject: [PATCH] Update to linux 6.14. --- nix/configuration/flake.lock | 18 +++++++++--------- .../hosts/hydra/optimized_build.nix | 2 +- .../hosts/odo/optimized_build.nix | 4 ++-- .../hosts/quark/optimized_build.nix | 4 ++-- nix/configuration/roles/network/default.nix | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock index 69fc39f..fa83765 100644 --- a/nix/configuration/flake.lock +++ b/nix/configuration/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1745858959, - "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=", + "lastModified": 1746369725, + "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c", + "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs-unoptimized": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { diff --git a/nix/configuration/hosts/hydra/optimized_build.nix b/nix/configuration/hosts/hydra/optimized_build.nix index f9e3c7d..097c834 100644 --- a/nix/configuration/hosts/hydra/optimized_build.nix +++ b/nix/configuration/hosts/hydra/optimized_build.nix @@ -58,7 +58,7 @@ HZ_1000 = lib.kernel.no; } ( - optimizeWithFlags prev.linux_6_13 [ + optimizeWithFlags prev.linux_6_14 [ "-march=znver4" "-mtune=znver4" ] diff --git a/nix/configuration/hosts/odo/optimized_build.nix b/nix/configuration/hosts/odo/optimized_build.nix index b4ee24f..34ffeac 100644 --- a/nix/configuration/hosts/odo/optimized_build.nix +++ b/nix/configuration/hosts/odo/optimized_build.nix @@ -61,7 +61,7 @@ HZ = lib.kernel.freeform "300"; HZ_300 = lib.kernel.yes; HZ_1000 = lib.kernel.no; - } prev.linux_6_13; + } prev.linux_6_14; # gsl = prev.gsl.overrideAttrs (old: { # # gsl tests fails when optimizations are enabled. # # > FAIL: cholesky_invert unscaled hilbert ( 4, 4)[0,2]: 2.55795384873636067e-13 0 @@ -104,7 +104,7 @@ boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me; }) (lib.mkIf (config.me.buildingIso) { - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14; boot.supportedFilesystems.zfs = true; }) ]; diff --git a/nix/configuration/hosts/quark/optimized_build.nix b/nix/configuration/hosts/quark/optimized_build.nix index ea654ff..dff32d4 100644 --- a/nix/configuration/hosts/quark/optimized_build.nix +++ b/nix/configuration/hosts/quark/optimized_build.nix @@ -74,7 +74,7 @@ HZ = lib.kernel.freeform "300"; HZ_300 = lib.kernel.yes; HZ_1000 = lib.kernel.no; - } prev.linux_6_13; + } prev.linux_6_14; } ) (final: prev: { @@ -111,7 +111,7 @@ boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me; }) (lib.mkIf (config.me.buildingIso) { - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13; + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_14; boot.supportedFilesystems.zfs = true; }) ]; diff --git a/nix/configuration/roles/network/default.nix b/nix/configuration/roles/network/default.nix index a8bf131..7e11876 100644 --- a/nix/configuration/roles/network/default.nix +++ b/nix/configuration/roles/network/default.nix @@ -37,10 +37,10 @@ # Test with: drill @127.0.0.53 odo.home.arpa # TODO: The 127.0.0.1 address should probably be moved to a host-specific file. networking.extraHosts = '' - 127.0.0.1 odo.home.arpa quark.home.arpa + 127.0.0.1 ${config.networking.hostName}.home.arpa 10.216.1.1 homeserver 10.216.1.6 media - #10.216.1.12 odo + 10.216.1.12 odo 10.216.1.14 neelix 10.216.1.15 quark 10.217.1.1 drmario