aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-08-23 11:56:25 -0700
committerMark Nipper <nipsy@bitgnome.net>2026-08-23 11:56:25 -0700
commit1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed (patch)
tree3575e0516d52448356c56bf7f49ce821e350af9d
parent8f6ee241a38ef0a7a62d2c0ca05fbe0de8a00051 (diff)
downloadnix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar.gz
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar.bz2
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar.lz
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar.xz
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.tar.zst
nix-1d6ec9ce7a858a8ff23ce1f9b294ff3f1cb455ed.zip
Bump caladan to latest kernel and OpenZFS
-rw-r--r--hosts/caladan/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 5449721..24d7afd 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -6,7 +6,7 @@
"kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/
#"net.ipv4.tcp_congestion_control" = "reno";
};
- kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+ kernelPackages = pkgs.master.linuxPackages_7_2;
#kernelParams = [
# "amdgpu.ppfeaturemask=0xfffd3fff"
# "split_lock_detect=off"
@@ -28,7 +28,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
forceImportRoot = false;
- package = pkgs.kerneol.zfs_2_4;
+ package = pkgs.master.zfs_2_4;
requestEncryptionCredentials = false;
};
};
@@ -47,7 +47,7 @@
pkgs.igir
pkgs.kobodeluxe
pkgs.linux-firmware
- pkgs.kerneol.linuxKernel.packages.linux_7_0.turbostat
+ pkgs.master.linuxKernel.packages.linux_7_2.turbostat
pkgs.lrzsz
pkgs.mailutils
pkgs.minicom
@@ -148,7 +148,7 @@
#inputs.nvidia-patch.overlays.default
outputs.overlays.additions
outputs.overlays.modifications
- outputs.overlays.kerneol-packages
+ #outputs.overlays.kerneol-packages
outputs.overlays.master-packages
#outputs.overlays.my-nixpkgs-packages
#outputs.overlays.pr545346-packages