JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #802 from wizeman/kernel_update

Browse Source 
Kernel update
This commit is contained in:
Evgeny Egorochkin 2013-08-11 15:08:45 -07:00
commit 27dcd771c3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/generate-config.pl
View File

@ -54,8 +54,8 @@ sub runConfig {
if ($s eq "\n") {
print STDERR "GOT: $line" if $debug;
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)").
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) {
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
$choices{$2} = $1;
}

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.2.49";
version = "3.2.50";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68";
};
features.iwlwifi = true;

8
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -131,11 +131,11 @@ rec {
patch = ./mips-ext3-n32.patch;
};
grsecurity_2_9_1_3_2_48 =
{ name = "grsecurity-2.9.1-3.2.48";
grsecurity_2_9_1_3_2_50 =
{ name = "grsecurity-2.9.1-3.2.50";
patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch;
sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n";
};
};

2
pkgs/top-level/all-packages.nix
View File

@ -6413,7 +6413,7 @@ let
};
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ];
})) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}));
linux_3_2_apparmor = lowPrio (linux_3_2.override {