diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-07 17:13:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 17:13:24 -0500 |
| commit | b23aa70952480a18dd50364c33c95793efa2a943 (patch) | |
| tree | 2ea9093bc6e74a4deabe25a9be8c043d76284230 | |
| parent | 730b739ec669772c66331b339a187d46e7aedf4a (diff) | |
| parent | 0266449187ebc8efe75124cc35f7f079d6976c0b (diff) | |
| download | nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar.gz nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar.bz2 nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar.lz nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar.xz nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.tar.zst nixpkgs-b23aa70952480a18dd50364c33c95793efa2a943.zip | |
Merge pull request #70173 from eadwu/raspberrypi/1.20190925
raspberrypi: 1.20190925
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 98cf56f799e..a8c4bd559d3 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 { pname = "raspberrypi-firmware"; - version = "1.20190819"; + version = "1.20190925"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0qzpc092qg748i5s23xa1jk6qpga9wn0441r2awsz0apkysqx5fj"; + sha256 = "0xyj3f04dcfnl9hp8hakgwcb1msqh7934n0pclcmzy47xjkz7ris"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index c22866742b9..6f5f2524276 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: let - modDirVersion = "4.19.71"; - tag = "1.20190906"; + modDirVersion = "4.19.75"; + tag = "1.20190925"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -11,8 +11,8 @@ lib.overrideDerivation (buildLinux (args // { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = "9532eb3c84d8d952ef28da3d135683ac01adc9b8"; - sha256 = "0168wz8kkdzbyha41iqlgn1z1kcy4smg89rgxkgadzq78y7fglpl"; + rev = "raspberrypi-kernel_${tag}-1"; + sha256 = "0l91kb4jjxg4fcp7d2aqm1fj34ns137rys93k907mdgnarcliafs"; }; defconfig = { |