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

linux: 4.9.34 -> 4.9.35

Browse Source 
Also, remove XSA-216 patches, the fixes are now integrated upstream
This commit is contained in:
Tim Steinbach 2017-06-29 08:26:25 -04:00
parent 6b35f22e28
commit d1aff8d2e5
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.9.34"; version = "4.9.35";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k"; sha256 = "0dklbr686ygvpbjs6chra9vycfvp8xjgkvapai14lglzsx72749l";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;

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

@ -156,21 +156,4 @@ rec {
sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2"; sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
}; };
}; };
# https://xenbits.xen.org/xsa/advisory-216.html
xen_XSA_216 =
{ name = "xen_XSA-216";
patch = fetchpatch {
url = "https://xenbits.xen.org/xsa/xsa216-linux-4.11.patch";
sha256 = "14h017n6qwnraw5bv72q9xkg2w7xvx290505kny5zfwx891xahs8";
};
};
xen_XSA_216_4-4 =
{ name = "xen_XSA-216-4.4";
patch = fetchpatch {
url = "https://xenbits.xen.org/xsa/xsa216-linux-4.4.patch";
sha256 = "1lv50wpr4lr49i4vp04vl778wcs9xn1jm51hp91h87jr0g3pbvi2";
};
};
} }

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

@ -11930,7 +11930,6 @@ with pkgs;
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.xen_XSA_216_4-4
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -11945,7 +11944,6 @@ with pkgs;
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -11962,7 +11960,6 @@ with pkgs;
# when adding a new linux version # when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -11976,7 +11973,6 @@ with pkgs;
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill
@ -13610,7 +13606,7 @@ with pkgs;
doodle = callPackage ../applications/search/doodle { }; doodle = callPackage ../applications/search/doodle { };
draftsight = callPackage ../applications/graphics/draftsight { }; draftsight = callPackage ../applications/graphics/draftsight { };
droopy = callPackage ../applications/networking/droopy { droopy = callPackage ../applications/networking/droopy {
inherit (python3Packages) wrapPython; inherit (python3Packages) wrapPython;
}; };