Add overlay for EOL 7.2 kernel and ZFS

3 files changed, 13 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index 36cb07c..e02ea9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     # specific nixpkgs commit for EOL kernel and ZFS
-    #nixpkgs-kerneol.url ="github:NixOS/nixpkgs/853901a31bddc8bdc9edde693f649f0e50edcfc5";
+    nixpkgs-kerneol.url ="github:NixOS/nixpkgs/8fd1ec5c2656654bcb19b1e3c1eb6541b19182c8";
 
     # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
     #my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61";
@@ -57,7 +57,7 @@
     home-manager,
     #my-nixpkgs,
     nixos-hardware,
-    #nixpkgs-kerneol,
+    nixpkgs-kerneol,
     nixpkgs-master,
     #nixpkgs-pr545346,
     nixpkgs-stable,
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 7c9d8ca..781d85c 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_2;
+    kernelPackages = pkgs.kerneol.linuxPackages_7_2;
     #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.kerneol.zfs_2_4;
       requestEncryptionCredentials = false;
     };
   };
@@ -48,7 +48,7 @@
     pkgs.kobodeluxe
     #pkgs.librechat
     pkgs.linux-firmware
-    pkgs.master.linuxKernel.packages.linux_7_2.turbostat
+    pkgs.kerneol.linuxKernel.packages.linux_7_2.turbostat
     #pkgs.llama-cpp-vulkan
     pkgs.lrzsz
     pkgs.mailutils
@@ -151,7 +151,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
diff --git a/overlays/default.nix b/overlays/default.nix
index e3bd4ee..fd40b84 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -87,13 +87,13 @@
 
   # When applied, the kerneol nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.kerneol'
-  #kerneol-packages = final: _prev: {
-  #  kerneol = import inputs.nixpkgs-kerneol {
-  #    inherit (final);
-  #    config.allowUnfree = true;
-  #    localSystem = final.stdenv.hostPlatform;
-  #  };
-  #};
+  kerneol-packages = final: _prev: {
+    kerneol = import inputs.nixpkgs-kerneol {
+      inherit (final);
+      config.allowUnfree = true;
+      localSystem = final.stdenv.hostPlatform;
+    };
+  };
 
   # When applied, the master nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.master'