about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-18 15:21:02 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-03-18 15:21:02 +0100
commit95a16e591e9e26158ebf1604e5cb2c82dfcf2856 (patch)
treeac01ddf996625b88ed70c8452de783042f773d70 /modules
parent9145982832bcb7ec4456348f136cb7641eadff81 (diff)
Move kernel source into the "kernel" NixOS module.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/system/kernel.nix11
1 files changed, 10 insertions, 1 deletions
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;