From 931501419b08407bea5b74bd930b7155d7ecfb01 Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Sun, 21 Dec 2025 03:21:59 +0100 Subject: [PATCH] Upgrade flake inputs and linux kernel to 6.18 --- flake.lock | 60 ++++++++++++++++++++-------------------- nix/system/linux.nix | 1 + nix/system/linux_x86.nix | 3 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index e0d600a..59fdd94 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764852467, - "narHash": "sha256-t20jUJE2S6aqh5YjUgjgP+u/uRmOV6CTGtBLKsA0/fQ=", + "lastModified": 1766064315, + "narHash": "sha256-aMoYLYIj+yYGhDKuSromj+VZYnMyN3lRRAZ+dk1IOiE=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "0ec4039ef904591afd235146a9a30945b6c8c0e3", + "rev": "f94f4496775f9ca6e8a9e9e83f5aa4e4210fbb5d", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1766282146, + "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1765039197, - "narHash": "sha256-OelC16t9UBY6RNxPEV2yHbKkdspbG26yZyDJ3RmgxwI=", + "lastModified": 1766281079, + "narHash": "sha256-HQwyYWFE1ZexLX7q4hObRwHSW1uwv0il/WocLz8Z6po=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "4d3a579b60d04fce6800da4aadb78b44d6e52f51", + "rev": "910d87b5f3e85eb9b867f904f3fcbd3d92293efa", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1765037898, - "narHash": "sha256-jXLRZNeKjpi9FlMvaWAucxtO4J8DT5POZ4XBF+viUOY=", + "lastModified": 1766280687, + "narHash": "sha256-qEqLt/4qOrP32QjVPrjeXcOv6iA3alD9qZTKNTkYmcY=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "f5ef9f8d993dee01b2e960cbe308e9acb89b4808", + "rev": "492419b7a1d040065b2cb37ececc9634c204b1a0", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -275,11 +275,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764730608, - "narHash": "sha256-FxKIa3OCSRVC23qrk7VT68vExUcmSruJ8OobVlSWOxc=", + "lastModified": 1765841014, + "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "10124c58674360765adcb38c9a8b081fb72904e4", + "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", "type": "github" }, "original": { @@ -354,11 +354,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -392,11 +392,11 @@ ] }, "locked": { - "lastModified": 1765039030, - "narHash": "sha256-e8sN3bZ/gGxkrdNoJtOCAxeVGcYvineCu2qsoaq+yRI=", + "lastModified": 1766256167, + "narHash": "sha256-KEaIZT5R9KftLGaZHJxJgR7M/XLwYGpvbgwIIPoJFu8=", "owner": "nix-community", "repo": "NUR", - "rev": "10d3e92a0938e08e1cd6060daa3321fab084471b", + "rev": "51d3347e63a34996f35275c77372eeafaa11e0ed", "type": "github" }, "original": { diff --git a/nix/system/linux.nix b/nix/system/linux.nix index f2f112c..5cafd53 100644 --- a/nix/system/linux.nix +++ b/nix/system/linux.nix @@ -16,6 +16,7 @@ }; boot = { + kernelPackages = pkgs.linuxKernel.packages.linux_6_18; consoleLogLevel = 0; }; diff --git a/nix/system/linux_x86.nix b/nix/system/linux_x86.nix index f8ecff8..e7929bd 100644 --- a/nix/system/linux_x86.nix +++ b/nix/system/linux_x86.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./hardware-configuration.nix @@ -6,7 +6,6 @@ ]; boot = { - kernelPackages = pkgs.linuxKernel.packages.linux_6_17; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true;