chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-13 11:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel: Add 4.0 and fix grsecurity message

Browse Source
This commit is contained in:
William A. Kennington III
2015-05-07 20:42:34 -07:00
parent 8123467a38
commit b4cf0bb944
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/linux/kernel/linux-3.19.nix
View File

@@ -2,7 +2,6 @@
import ./generic.nix (args // rec {
version = "3.19.7";
# Remember to update grsecurity!
extraMeta.branch = "3.19";
src = fetchurl {

1
pkgs/os-specific/linux/kernel/linux-4.0.nix
View File

@@ -2,6 +2,7 @@
import ./generic.nix (args // rec {
version = "4.0.2";
# Remember to update grsecurity!
extraMeta.branch = "4.0";
src = fetchurl {

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

@@ -8307,6 +8307,15 @@ let
];
};
linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -8452,8 +8461,8 @@ let
linuxPackages = linuxPackages_3_14;
# Update this when adding the newest kernel major version!
linux_latest = pkgs.linux_3_19;
linuxPackages_latest = pkgs.linuxPackages_3_19;
linux_latest = linuxPackages_latest.kernel;
linuxPackages_latest = pkgs.linuxPackages_4_0;
# Build the kernel modules for the some of the kernels.
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
@@ -8465,6 +8474,7 @@ let
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19);
linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
# grsecurity flavors