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

Commits on Oct 9, 2019

  1. Unverified

    The committer email address is not verified.
    Copy the full SHA
    bb978d8 View commit details

Commits on Oct 10, 2019

  1. Merge pull request #70817 from Enzime/update-nonfree-firmware

    firmware-linux-nonfree: 2019-08-15 -> 2019-09-23
    fpletz authored Oct 10, 2019
    Copy the full SHA
    f01ad3e View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "firmware-linux-nonfree";
version = "2019-08-15";
version = "2019-09-23";

src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "20190815";
sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r";
rev = "20190923";
sha256 = "1gq55ny6lb2nh6rr1w55bslzysyj0bwdl6rbpv882hhyjrnsma0n";
};

installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx";
outputHash = "1y2z3wxqq2km6x08kfdqgcr9xczbq1h2jqyrqr6h31bapjb8x0k9";

meta = with stdenv.lib; {
description = "Binary firmware collection packaged by kernel.org";