kernel: Switch to use boot.kernelPatches

Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no
longer need so much cruft to specify kernel patches, so let's switch to
boot.kernelPatches instead of the hackery we had so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 13 insertions, 14 deletions

diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 2b1304d2..a4408487 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -12,23 +12,22 @@ in {
   vuizvui.user.aszlig.programs.taalo-build.enable = true;
 
   boot = rec {
+    kernelPatches = singleton {
+      name = "bfqsched";
+      patch = pkgs.fetchpatch {
+        name = "cfq-replacement.patch";
+        url = "https://github.com/linusw/linux-bfq/compare/"
+            + "29b4817d4018df78086157ea3a55c1d9424a7cfc"
+            + "...cfq_replacement-logical.patch";
+        sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv";
+      };
+    };
+
     kernelPackages = with pkgs; let
       trimVer = ver: take 2 (splitString "." (replaceChars ["-"] ["."] ver));
       tooOld = trimVer linux_latest.version == trimVer linux_testing.version;
-      origKernel = if tooOld then linux_latest else linux_testing;
-      kernel = origKernel.override (origArgs: {
-        kernelPatches = origArgs.kernelPatches ++ singleton {
-          name = "bfqsched";
-          patch = pkgs.fetchpatch {
-            name = "cfq-replacement.patch";
-            url = "https://github.com/linusw/linux-bfq/compare/"
-                + "29b4817d4018df78086157ea3a55c1d9424a7cfc"
-                + "...cfq_replacement-logical.patch";
-            sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv";
-          };
-        };
-      });
-    in linuxPackagesFor kernel kernelPackages;
+      kernel = if tooOld then linux_latest else linux_testing;
+    in linuxPackagesFor kernel;
 
     initrd.kernelModules = [ "fbcon" "usb_storage" ];
     loader.grub.device = "/dev/disk/by-id/${diskID}";