Author: viric
Date: Tue May 22 15:29:51 2012
New Revision: 34209
URL: https://nixos.org/websvn/nix/?rev=34209&sc=1
Log:
Adding linux 3.4.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.4.nix
- copied, changed from r34207,
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.4.nix
(from r34207, nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix Tue May 22
12:31:31 2012 (r34207, copy source)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.4.nix Tue May 22
15:29:51 2012 (r34209)
@@ -233,7 +233,8 @@
import ./generic.nix (
rec {
- version = "3.3.6";
+ version = "3.4";
+ modDirVersion = "3.4.0";
testing = false;
preConfigure = ''
@@ -242,7 +243,7 @@
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/"
else ""}linux-${version}.tar.xz";
- sha256 = "04hplilmy9ks6nxi4292mcqwil6b5vinx90w23m41bll1x32gbq8";
+ sha256 =
"ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6";
};
config = configWithPlatform stdenv.platform;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 22 14:30:12
2012 (r34208)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 22 15:29:51
2012 (r34209)
@@ -5650,6 +5650,14 @@
];
};
+ linux_3_4 = makeOverridable (import
../os-specific/linux/kernel/linux-3.4.nix) {
+ inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+ kernelPatches =
+ [ #kernelPatches.fbcondecor_2_6_38
+ kernelPatches.sec_perm_2_6_24
+ ];
+ };
+
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@@ -5776,6 +5784,7 @@
linuxPackages_nanonote_jz_2_6_36 = linuxPackagesFor linux_nanonote_jz_2_6_36
pkgs.linuxPackages_nanonote_jz_2_6_36;
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2
pkgs.linuxPackages_3_2);
linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3
pkgs.linuxPackages_3_3);
+ linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4
pkgs.linuxPackages_3_4);
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
