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

Commits on Oct 1, 2019

  1. linux_rpi: 1.20190906 -> 1.20190925

    @eadwu
    eadwu committed Oct 1, 2019
    Copy the full SHA
    436d94f View commit details

  2. raspberrypifw: 1.20190819 -> 1.20190925

    @eadwu
    eadwu committed Oct 1, 2019
    Copy the full SHA
    0266449 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70173 from eadwu/raspberrypi/1.20190925 

    raspberrypi: 1.20190925
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    b23aa70 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/os-specific/linux/firmware/raspberrypi/default.nix
  2. +4 −4 pkgs/os-specific/linux/kernel/linux-rpi.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/kernel/linux-rpi.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {