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

Merge pull request #958 from wizeman/linux_3_2

Browse Source 
Update linux-3.2 & grsecurity
This commit is contained in:
Evgeny Egorochkin 2013-09-13 21:07:11 -07:00
commit 35cd18503e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -131,11 +131,11 @@ rec {
patch = ./mips-ext3-n32.patch; patch = ./mips-ext3-n32.patch;
}; };
grsecurity_2_9_1_3_2_50 = grsecurity_2_9_1_3_2_51 =
{ name = "grsecurity-2.9.1-3.2.50"; { name = "grsecurity-2.9.1-3.2.51";
patch = fetchurl { patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch; url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.51-201309101928.patch;
sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n"; sha256 = "90f9ddc74d56f4525b8faa8505a95f45c23a2e763c7519ba5ae953069a51aca2";
}; };
}; };

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

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