cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #118548 from mweinelt/raspberrypi

Browse source
This commit is contained in:
Martin Weinelt 2021-04-06 01:51:05 +02:00 committed by GitHub
commit 7b6416657d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libraspberrypi/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libraspberrypi";
version = "unstable-2021-01-11";
version = "unstable-2021-03-17";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c";
sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k";
rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615";
sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a";
};
patches = [

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

@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20210201";
version = "1.20210303";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i";
sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m";
};
installPhase = ''

6
pkgs/os-specific/linux/kernel/linux-rpi.nix
View file

@ -2,8 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.10.11";
tag = "1.20210201";
modDirVersion = "5.10.17";
tag = "1.20210303";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q";
sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx";
};
defconfig = {

7
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
View file

@ -3,13 +3,13 @@
}:
stdenvNoCC.mkDerivation {
pname = "raspberrypi-eeprom";
version = "2021-01-11";
version = "2021-03-18";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "54cadc816ba739afd08ead6d679e647de028a65c";
sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf";
rev = "ff27ccf69403b01e337fc4ee6e7ae75244028cce";
sha256 = "1q1vlld0xxh9zinf5g0qa6jw1dggq93br938mvrfx3nb2aviiwcj";
};
buildInputs = [ python3 ];
@ -28,7 +28,6 @@ stdenvNoCC.mkDerivation {
cp rpi-eeprom-config rpi-eeprom-update $out/bin
cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom
cp -r firmware/vl805 $out/bin
'';
fixupPhase = ''