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

Commits on May 23, 2017

  1. nginx-rtmp-module: 1.1.9 -> 1.1.11

    @globin
    globin committed May 23, 2017
    Copy the full SHA
    4f51da2 View commit details

  2. nginx: 1.10.3 -> 1.12.0

    @globin
    globin committed May 23, 2017
    Copy the full SHA
    4a83c09 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/servers/http/nginx/modules.nix
  2. +2 −2 pkgs/servers/http/nginx/stable.nix
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
src = fetchFromGitHub {
owner = "arut";
repo = "nginx-rtmp-module";
rev = "v1.1.9";
sha256 = "19vqw1ba01m2wlncpycw9vj5n8741pv36hd3dy9jjdxwlzdjzyi5";
rev = "v1.1.11";
sha256 = "09zrnf8lk179mpqnx92zm24xl7m3bq4ca84wc2zwi5hc8kxjbwxc";
};
};

4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/stable.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.10.3";
sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km";
version = "1.12.0";
sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml";
})