From 95a16e591e9e26158ebf1604e5cb2c82dfcf2856 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Mar 2015 15:21:02 +0100 Subject: Move kernel source into the "kernel" NixOS module. Signed-off-by: aszlig --- modules/user/aszlig/system/kernel.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'modules/user') diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix index 4a7ba609..a98a0a44 100644 --- a/modules/user/aszlig/system/kernel.nix +++ b/modules/user/aszlig/system/kernel.nix @@ -17,6 +17,15 @@ let mkConf = cfg: concatStringsSep "\n" (mapAttrsToList mkConfigLine cfg); in pkgs.writeText "generated.kconf" (mkConf exprs + "\n"); + mainlineKernel = { + version = "4.0.0-rc3"; + src = pkgs.fetchgit { + url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; + rev = "affb8172de395a6e1db52ed9790ca0456d8c29a9"; + sha256 = "1zqnkds0mglldm1syv17gl8n4wl1vy7rrh2vf3iga5w2psqwkyj4"; + }; + }; + in { options.vuizvui.user.aszlig.system.kernel = { enable = mkEnableOption "aszlig's custom kernel"; @@ -34,7 +43,7 @@ in { config = mkIf cfg.enable { boot = let linuxVuizvui = pkgs.buildLinux { - inherit (pkgs.kernelSourceVuizvui) version src; + inherit (mainlineKernel) version src; kernelPatches = singleton pkgs.vuizvuiKernelPatches.bfqsched; configfile = generateKConf cfg.config; -- cgit 1.4.1