diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index c5d7dedb111..59df5962744 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -37,10 +37,12 @@ let IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + # Enable NUMA. + NUMA? y + # Disable some expensive (?) features. FTRACE n KPROBES n - NUMA? n PM_TRACE_RTC n # Enable various subsystems. @@ -226,7 +228,7 @@ in import ./generic.nix ( rec { - version = "3.2.11"; + version = "3.2.14"; testing = false; modDirVersion = version; @@ -236,8 +238,8 @@ import ./generic.nix ( ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "1hacfmf08ydzf4xlg6wkkckl5icj7w9h3nh17myz1s67bp7q61qs"; + url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "032bv24wsab4c589svlq5ip8dcc4vihjcynq3ka18fgvxih251fm"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 0ac2665c9a6..fb7342defa9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -37,10 +37,12 @@ let IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + # Enable NUMA. + NUMA? y + # Disable some expensive (?) features. FTRACE n KPROBES n - NUMA? n PM_TRACE_RTC n # Enable various subsystems. @@ -227,8 +229,6 @@ import ./generic.nix ( rec { version = "3.3.1"; - testing = false; - preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" '';