From ffdc37215a0ca4d28364f0649108e620272cb8d4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 8 Aug 2011 20:49:49 +0000 Subject: [PATCH] kernel/generic.nix: Add a passed-thru modDirVersion attribute With the new kernel versioning scheme, the first release in a series only has a version number and a major revision number (e.g. linux 3.0, linux 3.1-rc1, etc.). Unfortunately, the module directory for these kernels still has a minor revision number (e.g. lib/modules/3.0.0, lib/modules/3.0.1-rc1, etc.). This causes problems for packages such as broadcom_sta that need to know the module directory, so this attribute will allow setting the module directory version number separate from the kernel version number when necessary. svn path=/nixpkgs/trunk/; revision=28405 --- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b5d10f06921..a86aef1af8e 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -6,6 +6,9 @@ , # The kernel version. version +, # The version number used for the module directory + modDirVersion ? version + , # The kernel configuration. config @@ -66,7 +69,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version; + inherit version modDirVersion; # 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; };