Author: shlevy
Date: Fri Sep 30 15:39:47 2011
New Revision: 29548
URL: https://ssl.nixos.org/websvn/nix/?rev=29548&sc=1
Log:
Enable setting the headersVersion so the default kernel can be updated without
rebuilding stdenv
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Fri Sep 30 15:37:35 2011 (r29547)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Fri Sep 30 15:39:47 2011 (r29548)
@@ -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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Fri Sep 30 15:37:35 2011 (r29547)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Fri Sep 30 15:39:47 2011 (r29548)
@@ -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 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
