From 5f5b87107f89ae0de0b1e39890a7906f162d4f00 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Mar 2017 21:16:31 +0200 Subject: [PATCH] raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-rpi.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 03281d2ee3a..50ffe7d25e6 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index e50a6c80232..264d4dffee1 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2cc71f0aad..f4e5375c99f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 ]; };