Author: shlevy
Date: Mon Aug 8 20:49:49 2011
New Revision: 28405
URL: https://svn.nixos.org/websvn/nix/?rev=28405&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Mon Aug 8
20:49:32 2011 (r28404)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Mon Aug 8
20:49:49 2011 (r28405)
@@ -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 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
