Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2b604c2836f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1252aa5c7398
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 2, 2018

  1. Copy the full SHA
    62429fe View commit details

Commits on Nov 4, 2018

  1. Merge pull request #49628 from lopsided98/raspberrypi-wireless-firmwa…

    …re-update
    
    raspberrypiWirelessFirmware: 2018-05-30 -> 2018-08-20
    Mic92 authored Nov 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1252aa5 View commit details
Showing with 19 additions and 20 deletions.
  1. +19 −20 pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
39 changes: 19 additions & 20 deletions pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
Original file line number Diff line number Diff line change
@@ -1,52 +1,51 @@
{ stdenv, fetchurl, dpkg }:
{ stdenv, fetchurl, fetchFromGitHub, dpkg }:

stdenv.mkDerivation rec {
name = "raspberrypi-wireless-firmware-${version}";
version = "2018-05-30";
version = "2018-08-20";

srcs = [
(fetchurl {
url = "https://archive.raspberrypi.org/debian/pool/main/b/bluez-firmware/bluez-firmware_1.2-3+rpt5.debian.tar.xz";
sha256 = "06zpyrz6frkgjy26hr3998klnhjdqxwashgjgvj9rgbcqy70nkxg";
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "ade2bae1aaaebede09abb8fb546f767a0e4c7804";
sha256 = "07gm76gxp5anv6paryvxcp34a86fkny8kdlzqhzcpfczzglkp6ag";
})
(fetchurl {
url = "https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-brcm80211_20161130-3+rpt3_all.deb";
sha256 = "10l74ac28baprnsiylf2vy4pkxgb3crixid90ngs6si9smm7rn6z";
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "b518de45ced519e8f7a499f4778100173402ae43";
sha256 = "1d5026ic9awji6c67irpwsxpxgsc0dhn11d3abkxi2vvra1pir4g";
})
];

sourceRoot = ".";

dontBuild = true;
# Firmware blobs do not need fixing and should not be modified
dontFixup = true;


# Unpack the debian package
nativeBuildInputs = [ dpkg ];
unpackCmd = ''
if ! [[ "$curSrc" =~ \.deb$ ]]; then return 1; fi
dpkg -x "$curSrc" .
'';

installPhase = ''
mkdir -p "$out/lib/firmware/brcm"
# Wifi firmware
for filename in lib/firmware/brcm/brcmfmac434??-sdio.*; do
for filename in firmware-nonfree/brcm/brcmfmac434??-sdio.*; do
cp "$filename" "$out/lib/firmware/brcm"
done
# Bluetooth firmware
cp broadcom/*.hcd "$out/lib/firmware/brcm"
cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
'';

outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1gwzasl5w5nc0awqv3w2081ns63wd1yds0xh0dg95dc6brnqhhf8";
outputHash = "1s5gb00v42s5izbaw8irs1fwvhh7z9wl07czc0nkw6p91871ivb7";

meta = with stdenv.lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/;
homepage = https://github.com/RPi-Distro/firmware-nonfree;
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
maintainers = with maintainers; [ lopsided98 ];