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

linux_rpi: 1.20170303 -> 1.20170427

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-05-15 05:07:17 +03:00
parent f2e2dde681
commit a35ec5dda6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
let let
modDirVersion = "4.4.50"; modDirVersion = "4.9.24";
tag = "1.20170303"; tag = "1.20170427";
in in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-${tag}"; version = "${modDirVersion}-${tag}";
@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = "raspberrypi-kernel_${tag}-1"; rev = "raspberrypi-kernel_${tag}-1";
sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx"; sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9";
}; };
features.iwlwifi = true; features.iwlwifi = true;
@ -36,6 +36,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
} }
# I am not sure if all of these are correct... # I am not sure if all of these are correct...
copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
@ -45,5 +46,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
# bcm2710-rpi-cm3.dts is yet unknown.
''; '';
}) })

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

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