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

Commits on Jul 31, 2017

  1. Copy the full SHA
    8523ab5 View commit details
  2. Copy the full SHA
    3db9a2b View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/os-specific/linux/firmware/raspberrypi/default.nix
  2. +3 −3 pkgs/os-specific/linux/kernel/linux-rpi.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/firmware/raspberrypi/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
version = "1.20170427";
version = "1.20170515";

src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl";
sha256 = "0liy0p69p9yr5cqgrfc23d3n243xkrx889gc8yqd9m2jpns4s361";
};

dontStrip = true; # Stripping breaks some of the binaries
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-rpi.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:

let
modDirVersion = "4.9.24";
tag = "1.20170427";
modDirVersion = "4.9.28";
tag = "1.20170515";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9";
sha256 = "19cjvns6zs53l319k3a2angffr93dh2j9g0022ww6rmi6niq4fkf";
};

features.iwlwifi = true;