aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/caladan/default.nix
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2026-05-22 12:46:58 -0700
committerMark Nipper <nipsy@bitgnome.net>2026-05-22 12:46:58 -0700
commit18add581f123d941b32e63443996c75f9704b46d (patch)
treecee3ca528dbfcaa54838e3ea669900b61b4dfb6e /hosts/caladan/default.nix
parent86607cc679f76c74fc5b31e58d473210634e9d3d (diff)
downloadnix-18add581f123d941b32e63443996c75f9704b46d.tar
nix-18add581f123d941b32e63443996c75f9704b46d.tar.gz
nix-18add581f123d941b32e63443996c75f9704b46d.tar.bz2
nix-18add581f123d941b32e63443996c75f9704b46d.tar.lz
nix-18add581f123d941b32e63443996c75f9704b46d.tar.xz
nix-18add581f123d941b32e63443996c75f9704b46d.tar.zst
nix-18add581f123d941b32e63443996c75f9704b46d.zip
Bump kernel and ZFS versions back to nixos-unstable branch
Diffstat (limited to 'hosts/caladan/default.nix')
-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 b06f0bb..7ae0080 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.master.linuxPackages_7_0;
+ kernelPackages = pkgs.linuxPackages_7_0;
#kernelParams = [
# "amdgpu.ppfeaturemask=0xfffd3fff"
# "split_lock_detect=off"
@@ -28,7 +28,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
forceImportRoot = false;
- package = pkgs.master.zfs_2_4;
+ package = pkgs.zfs_2_4;
};
};
@@ -46,7 +46,7 @@
#pkgs.igir
pkgs.kobodeluxe
pkgs.linux-firmware
- pkgs.master.linuxKernel.packages.linux_7_0.turbostat
+ pkgs.linuxKernel.packages.linux_7_0.turbostat
pkgs.lrzsz
pkgs.mailutils
pkgs.minicom