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

Merge pull request #70173 from eadwu/raspberrypi/1.20190925

Browse Source 
raspberrypi: 1.20190925
This commit is contained in:
Matthew Bauer 2019-11-07 17:13:24 -05:00 committed by GitHub
commit b23aa70952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "raspberrypi-firmware"; pname = "raspberrypi-firmware";
version = "1.20190819"; version = "1.20190925";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = version;
sha256 = "0qzpc092qg748i5s23xa1jk6qpga9wn0441r2awsz0apkysqx5fj"; sha256 = "0xyj3f04dcfnl9hp8hakgwcb1msqh7934n0pclcmzy47xjkz7ris";
}; };
installPhase = '' installPhase = ''

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

@ -1,8 +1,8 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args:
let let
modDirVersion = "4.19.71"; modDirVersion = "4.19.75";
tag = "1.20190906"; tag = "1.20190925";
in in
lib.overrideDerivation (buildLinux (args // { lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}"; version = "${modDirVersion}-${tag}";
@ -11,8 +11,8 @@ lib.overrideDerivation (buildLinux (args // {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = "9532eb3c84d8d952ef28da3d135683ac01adc9b8"; rev = "raspberrypi-kernel_${tag}-1";
sha256 = "0168wz8kkdzbyha41iqlgn1z1kcy4smg89rgxkgadzq78y7fglpl"; sha256 = "0l91kb4jjxg4fcp7d2aqm1fj34ns137rys93k907mdgnarcliafs";
}; };
defconfig = { defconfig = {