Bump kernel and ZFS versions back to nixos-unstable branchHEADmaster

11 files changed, 23 insertions, 23 deletions

diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 07f3e8b..22ebf08 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -7,7 +7,7 @@
       "net.netfilter.nf_log_all_netns" = 1;
       #"net.ipv4.conf.all.proxy_arp" = 1;
     };
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -25,7 +25,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 4d3aab0..2f8353c 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;
       requestEncryptionCredentials = false;
     };
   };
@@ -47,7 +47,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
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 08d6e78..e699f79 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -5,7 +5,7 @@
       "kernel.hostname" = "darkstar.bitgnome.net";
       "net.ipv4.ip_forward" = true;
     };
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -23,7 +23,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/fangorn/default.nix b/hosts/fangorn/default.nix
index cdf30af..6f442ec 100644
--- a/hosts/fangorn/default.nix
+++ b/hosts/fangorn/default.nix
@@ -1,6 +1,6 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index df4c558..0607731 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,7 +1,7 @@
 { config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -13,7 +13,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 6c73e8a..8285e2b 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index 3fba8dc..6008d31 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -1,7 +1,7 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix
index 8c52d18..5d45212 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 3fdef04..0bee032 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,7 +1,7 @@
 { config, inputs, lib, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -14,7 +14,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix
index 9cad0ae..c014023 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };
 
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
index 52db18f..f95294b 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,7 +4,7 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
-    kernelPackages = pkgs.master.linuxPackages_7_0;
+    kernelPackages = pkgs.linuxPackages_7_0;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {
@@ -17,7 +17,7 @@
     zfs = {
       devNodes = "/dev/disk/by-label";
       forceImportRoot = false;
-      package = pkgs.master.zfs_2_4;
+      package = pkgs.zfs_2_4;
     };
   };