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: 3dc58eda52ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7eace49cc5cd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 28, 2019

  1. linux_rpi1: fix Raspberry Pi Zero device tree file name

    @lopsided98
    lopsided98 committed Sep 28, 2019
    Copy the full SHA
    1f28946 View commit details

Commits on Oct 3, 2019

  1. Merge pull request #69917 from lopsided98/linux-rpi-1-dtb-rename 

    linux_rpi1: fix Raspberry Pi Zero device tree file name
    @matthewbauer
    matthewbauer authored Oct 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7eace49 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-rpi.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-rpi.nix
View file
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ lib.overrideDerivation (buildLinux (args // {
cp -v "$dtbDir/$1" "$dtbDir/$2"
}
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) ''
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb