nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 20:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: 4.6.4 -> 4.6.5

Browse Source 
Removed patch was applied upstream.
This commit is contained in:
Franz Pletz 2016-07-28 23:00:53 +02:00
parent b68fe1a572
commit 9aee2a17af
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.6.4"; version = "4.6.5";
extraMeta.branch = "4.6"; extraMeta.branch = "4.6";
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 = "0zpz29hgwdwkil6rakn08bdq77qjcz8q18qlkfc43s84f4fd8s45"; sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;

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

@ -11107,7 +11107,6 @@ in
linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.qat_common_Makefile
kernelPatches.hiddev_CVE_2016_5829 kernelPatches.hiddev_CVE_2016_5829
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")