diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
| commit | 217cf982c754f1e8506e180551c73f57c04aed7f (patch) | |
| tree | b816e2671be3cc3d22f165cbf593bb5cce3c4173 /pkgs/os-specific/linux/firmware | |
| parent | ab77ea0bf25dd1f193c8dd078ef7e90523366135 (diff) | |
| parent | f9021cc12980370f60cce54ec899b11aebb5ed0b (diff) | |
| download | nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar.gz nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar.bz2 nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar.lz nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar.xz nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.tar.zst nixpkgs-217cf982c754f1e8506e180551c73f57c04aed7f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e9ee91a2de7..392ddda6f57 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2018-08-20"; + version = "2019-08-16"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "ade2bae1aaaebede09abb8fb546f767a0e4c7804"; - sha256 = "07gm76gxp5anv6paryvxcp34a86fkny8kdlzqhzcpfczzglkp6ag"; + rev = "96eefffcccc725425fd83be5e0704a5c32b79e54"; + sha256 = "05h57gcxhb2c84h99cyxxx4mzi6kd5fm8pjqkz3nq5vs3nv8cqhr"; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "b518de45ced519e8f7a499f4778100173402ae43"; - sha256 = "1d5026ic9awji6c67irpwsxpxgsc0dhn11d3abkxi2vvra1pir4g"; + rev = "130cb86fa30cafbd575d38865fa546350d4c5f9c"; + sha256 = "0jmhgbpldzz8n8lncpzwfl5ym8zgss05y952rfpwcf9v5c7vgabx"; }) ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1s5gb00v42s5izbaw8irs1fwvhh7z9wl07czc0nkw6p91871ivb7"; + outputHash = "1r4alf1fbj6vkkf54d0anm47ymb6gn2ykl4a2hhd34b0hnf1dnhn"; meta = with stdenv.lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index ebd69d1fe12..98cf56f799e 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.20190620+1"; + version = "1.20190819"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0gbqlkr50qlmbpwr0n61pb58w0k3sfjfirh2y683rlkp5rlq7mrf"; + sha256 = "0qzpc092qg748i5s23xa1jk6qpga9wn0441r2awsz0apkysqx5fj"; }; installPhase = '' |