steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

sj laptop: add BFQ patches to kernel

Browse source
This commit is contained in:
steveej 2016-07-08 15:01:42 -07:00
parent e1e88dd60b
commit 735fc7dd14
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configuration/steveej-laptop/hw.nix
View file

@ -10,6 +10,8 @@
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
hardware.trackpoint.emulateWheel = true; hardware.trackpoint.emulateWheel = true;
boot.kernelPackages = pkgs.myLinuxPackages;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];

35
configuration/steveej-laptop/pkg.nix
View file

@ -12,8 +12,41 @@ in
packageOverrides = pkgs: rec { packageOverrides = pkgs: rec {
go = gitpkgs.go1_6; go = gitpkgs.go1_6;
bluez = pkgs.bluez5; bluez = pkgs.bluez5;
linuxPackages = pkgs.linuxPackages_latest;
#pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; }; #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; };
myLinuxPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor
(pkgs.linux_latest.override {
kernelPatches = pkgs.linux_latest.kernelPatches ++ [
{
name = "bfq1";
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 = "bfq2";
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 = "bfq3";
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";
};
}
];
extraConfig = ''
BFQ_GROUP_IOSCHED y
IOSCHED_BFQ y
DEFAULT_BFQ y
'';
})
pkgs.linuxPackages_latest
);
}; };
allowUnfree = true; allowUnfree = true;