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

Commits on Jul 5, 2017

  1. firmwareLinuxNonfree: 2017-04-16 -> 2017-07-05 

    Fixes #27129.
    @fpletz
    fpletz committed Jul 5, 2017
    Copy the full SHA
    e1b29dd View commit details

  2. nginxMainline: 1.13.1 -> 1.13.2

    @fpletz
    fpletz committed Jul 5, 2017
    Copy the full SHA
    c719890 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
  2. +2 −2 pkgs/servers/http/nginx/mainline.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
name = "firmware-linux-nonfree-${version}";
version = "2017-04-16";
version = "2017-07-05";

# This repo is built by merging the latest versions of
# http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "fpletz";
repo = "linux-firmware";
rev = version;
sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc";
sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if";
};

preInstall = ''
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/mainline.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:

callPackage ./generic.nix (args // {
version = "1.13.1";
sha256 = "0xk7gcsgwhz047h54adn8crnkrkr7g1z79w8ik34v6k0lrr6r1d5";
version = "1.13.2";
sha256 = "0w4vj6hl23z9kdw09v7jzq3c1593i4fhwmrz6qx2g7cq2i6j6zyp";
})