public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable setting the headersVersion so the default kernel can be updated without rebuilding stdenv

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29548
This commit is contained in:
Shea Levy 2011-09-30 15:39:47 +00:00
parent c10d43d3bd
commit 1a7554562f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -3,7 +3,7 @@
assert cross == null -> stdenv.isLinux; assert cross == null -> stdenv.isLinux;
let let
version = kernel.version; version = kernel.headersVersion;
kernelHeadersBaseConfig = if (cross == null) then kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig stdenv.platform.kernelHeadersBaseConfig
else else

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -9,6 +9,9 @@
, # The kernel version. , # The kernel version.
version version
, # The kernel headers version.
headersVersion ? version
, # The version number used for the module directory , # The version number used for the module directory
modDirVersion ? version modDirVersion ? version
@ -72,7 +75,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
inherit version modDirVersion headersSrc; inherit version modDirVersion headersSrc headersVersion;
# Combine the `features' attribute sets of all the kernel patches. # 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; features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
}; };