raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303

This commit is contained in:
Tuomas Tynkkynen 2017-03-03 21:16:31 +02:00
parent 4ae5f4d3cc
commit 5f5b87107f
3 changed files with 6 additions and 7 deletions

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
version = "1.20161020";
version = "1.20170303";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34";
sha256 = "1s5dycgix97681vpq7ggpc27n865wgv9npzxvbr2q2bp3ia9mcim";
};
dontStrip = true; # Stripping breaks some of the binaries

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
modDirVersion = "4.4.26";
tag = "1.20161020-1";
modDirVersion = "4.4.50";
tag = "1.20170303";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-${tag}";
@ -11,8 +11,8 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}";
sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx";
};
features.iwlwifi = true;

View File

@ -11384,7 +11384,6 @@ with pkgs;
linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
kernelPatches = with kernelPatches; [
bridge_stp_helper
packet_fix_race_condition_CVE_2016_8655
DCCP_double_free_vulnerability_CVE-2017-6074
];
};