aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-05-23 17:52:04 -0700
committerMark Nipper <nipsy@bitgnome.net>2026-05-23 17:52:04 -0700
commitf2e66d41e908797b9cf25cd63732e81cf6a7304d (patch)
tree815f4907076edba70c19d2eabc12b7566cd94c33
parent909fb87ce5da82c07519c601172d4d89135dbaba (diff)
downloadnix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar.gz
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar.bz2
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar.lz
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar.xz
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.tar.zst
nix-f2e66d41e908797b9cf25cd63732e81cf6a7304d.zip
Bump kernel and ZFS versions back to master branch @caladan
-rw-r--r--hosts/caladan/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 5c8a885..0b113e0 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.linuxPackages_7_0;
+ kernelPackages = pkgs.master.linuxPackages_7_0;
#kernelParams = [
# "amdgpu.ppfeaturemask=0xfffd3fff"
# "split_lock_detect=off"
@@ -28,7 +28,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
forceImportRoot = false;
- package = pkgs.zfs_2_4;
+ package = pkgs.master.zfs_2_4;
};
};
@@ -46,7 +46,7 @@
pkgs.igir
pkgs.kobodeluxe
pkgs.linux-firmware
- pkgs.linuxKernel.packages.linux_7_0.turbostat
+ pkgs.master.linuxKernel.packages.linux_7_0.turbostat
pkgs.lrzsz
pkgs.mailutils
pkgs.minicom