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

Commits on Oct 8, 2018

  1. linux_rpi: 1.20180817 -> 1.20180919

    @lopsided98
    lopsided98 committed Oct 8, 2018
    Copy the full SHA
    de25f78 View commit details

  2. raspberrypifw: 1.20180817 -> 1.20180919

    @lopsided98
    lopsided98 committed Oct 8, 2018
    Copy the full SHA
    ec1aa05 View commit details

  3. raspberrypi-tools: 2018-02-05 -> 2018-10-03

    @lopsided98
    lopsided98 committed Oct 8, 2018
    Copy the full SHA
    964ae43 View commit details

Commits on Oct 13, 2018

  1. Merge pull request #48028 from lopsided98/rpi-firmware-update 

    linux_rpi, rasperrypifw, raspberrypi-tools: update to latest versions
    @infinisil
    infinisil authored Oct 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca3f389 View commit details
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 {
name = "raspberrypi-firmware-${version}";
version = "1.20180817";
version = "1.20180919";

src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm";
sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4";
};

installPhase = ''
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
6 changes: 3 additions & 3 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, ... } @ 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 = {