mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 14:48:25 +03:00
commit
27dcd771c3
@ -54,8 +54,8 @@ sub runConfig {
|
|||||||
if ($s eq "\n") {
|
if ($s eq "\n") {
|
||||||
print STDERR "GOT: $line" if $debug;
|
print STDERR "GOT: $line" if $debug;
|
||||||
|
|
||||||
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)").
|
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
|
||||||
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) {
|
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
|
||||||
$choices{$2} = $1;
|
$choices{$2} = $1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, ... } @ args:
|
{ stdenv, fetchurl, ... } @ args:
|
||||||
|
|
||||||
import ./generic.nix (args // rec {
|
import ./generic.nix (args // rec {
|
||||||
version = "3.2.49";
|
version = "3.2.50";
|
||||||
|
|
||||||
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 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
|
sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68";
|
||||||
};
|
};
|
||||||
|
|
||||||
features.iwlwifi = true;
|
features.iwlwifi = true;
|
||||||
|
@ -131,11 +131,11 @@ rec {
|
|||||||
patch = ./mips-ext3-n32.patch;
|
patch = ./mips-ext3-n32.patch;
|
||||||
};
|
};
|
||||||
|
|
||||||
grsecurity_2_9_1_3_2_48 =
|
grsecurity_2_9_1_3_2_50 =
|
||||||
{ name = "grsecurity-2.9.1-3.2.48";
|
{ name = "grsecurity-2.9.1-3.2.50";
|
||||||
patch = fetchurl {
|
patch = fetchurl {
|
||||||
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
|
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch;
|
||||||
sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
|
sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -6413,7 +6413,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_48 ];
|
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ];
|
||||||
})) (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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user