diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-13 21:16:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 21:16:21 +0200 |
| commit | ca3f3897e9c521b93fa6202a3693c4e31d08bbbb (patch) | |
| tree | 24b17ef80b46d1f50147593faaac11a7abaa9303 | |
| parent | ea6fc49f0f02300742708ad1a202d8c0745507f9 (diff) | |
| parent | 964ae43b53e689d4b8dd77dcba5dffada875b6b2 (diff) | |
| download | nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar.gz nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar.bz2 nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar.lz nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar.xz nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.tar.zst nixlib-ca3f3897e9c521b93fa6202a3693c4e31d08bbbb.zip | |
Merge pull request #48028 from lopsided98/rpi-firmware-update
linux_rpi, rasperrypifw, raspberrypi-tools: update to latest versions
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 11a5074cff2c..db1091e349dc 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.20180817"; + version = "1.20180919"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm"; + sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 91e6e7f4cc59..4685f6757179 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-tools-${version}"; - version = "2018-02-05"; + version = "2018-10-03"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "a343dcad1dae4e93f4bfb99496697e207f91027e"; - sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1"; + rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac"; + sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg"; }; patches = [ ./tools-dont-install-sysv-init-scripts.patch ]; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d95c2caa2cf0..096b3ecde22a 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, ... } @ args: let - modDirVersion = "4.14.62"; - tag = "1.20180817"; + modDirVersion = "4.14.70"; + tag = "1.20180919"; in lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "17k7c9hcp834qmlpllag8jc6xhym9wkr5lck1vr0y2wlcxccwnaz"; + sha256 = "1zjvzk6rhrn3ngc012gjq3v7lxn8hy89ljb7fqwld5g7py9lkf0b"; }; defconfig = { |