From 3f1f16ad1342befa65e8c3a1ffa7a7c32fcbc8ad Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 8 Jul 2016 15:01:42 -0700
Subject: [PATCH] sj laptop: add BFQ patches to kernel

---
 configuration/steveej-laptop/hw.nix  |  2 ++
 configuration/steveej-laptop/pkg.nix | 31 ++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/configuration/steveej-laptop/hw.nix b/configuration/steveej-laptop/hw.nix
index 9b4c429..4a99e58 100644
--- a/configuration/steveej-laptop/hw.nix
+++ b/configuration/steveej-laptop/hw.nix
@@ -10,6 +10,8 @@
     hardware.enableAllFirmware = true;
     hardware.trackpoint.emulateWheel = true;
 
+    boot.kernelPackages = pkgs.myLinuxPackages;
+
     boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
     boot.kernelModules = [ "kvm-intel" ];
     boot.extraModulePackages = [ ];
diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index e2d912d..676de8c 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -12,9 +12,36 @@ in
     packageOverrides = pkgs: rec {
       go = gitpkgs.go1_6;
       bluez = pkgs.bluez5;
-      linuxPackages = pkgs.linuxPackages_latest;
       #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; };
-    };
+
+      myLinuxPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor
+        (pkgs.linux_latest.override {
+           kernelPatches = pkgs.linux_latest.kernelPatches ++ [
+              { patch = pkgs.fetchurl {
+                  url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch";
+                  sha256 = "1j6h831kj32c9slzm4vhjvd8m17gbwh713kcpc54z9i02fwyq6ax";
+                };
+                name = "bfq1"; }
+              { patch = pkgs.fetchurl {
+                  url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch";
+                  sha256 = "1q8nf7fcp72s2xz2pfl22sv4w5fm4hzgciljrkd3g7gj5xvi27lw";
+                };
+                name = "bfq2"; }
+              { patch = pkgs.fetchurl {
+                  url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch";
+                  sha256 = "1q2j7g3cfwi52psxgwa06hadl6c2fh87ckm07pyaj35n6524gjg0";
+                };
+                name = "bfq3"; }
+            ];
+            extraConfig  = ''
+              BFQ_GROUP_IOSCHED y
+              IOSCHED_BFQ y
+              DEFAULT_BFQ y
+            '';
+        })
+        pkgs.linuxPackages_latest
+        );
+     };
 
     allowUnfree = true;