From 1a7554562f516cef17a7fdb0258e5f1f7f738d14 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 30 Sep 2011 15:39:47 +0000
Subject: [PATCH] Enable setting the headersVersion so the default kernel can
 be updated without rebuilding stdenv

svn path=/nixpkgs/branches/stdenv-updates/; revision=29548
---
 pkgs/os-specific/linux/kernel-headers/default.nix | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 7153e730a4a1..d2c6bf9d700e 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -3,7 +3,7 @@
 assert cross == null -> stdenv.isLinux;
 
 let
-  version = kernel.version;
+  version = kernel.headersVersion;
   kernelHeadersBaseConfig = if (cross == null) then
       stdenv.platform.kernelHeadersBaseConfig
     else
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 355f0c9c5ba0..6ed8164f341d 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -9,6 +9,9 @@
 , # The kernel version.
   version
 
+, # The kernel headers version.
+  headersVersion ? version
+
 , # The version number used for the module directory
   modDirVersion ? version
 
@@ -72,7 +75,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   passthru = {
-    inherit version modDirVersion headersSrc;
+    inherit version modDirVersion headersSrc headersVersion;
     # Combine the `features' attribute sets of all the kernel patches.
     features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
   };