diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-24 03:20:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-24 03:24:06 +0200 |
| commit | 8004e794153b34507f81a26f88174bdfee975aa8 (patch) | |
| tree | 874e59b6b33bc0fdce26a6dc4a116b8b36b43205 /pkgs/servers | |
| parent | 1267b155c4a5afc6bda0a27b458c649a420dce2b (diff) | |
| parent | 39e042fd64f41aa8610f35dcf4c4e9447ed59b3a (diff) | |
| download | nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar.gz nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar.bz2 nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar.lz nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar.xz nixlib-8004e794153b34507f81a26f88174bdfee975aa8.tar.zst nixlib-8004e794153b34507f81a26f88174bdfee975aa8.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/stable.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/uwsgi/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 02786cd19d10..ea819c7ec835 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,8 +15,8 @@ src = fetchFromGitHub { owner = "arut"; repo = "nginx-rtmp-module"; - rev = "v1.1.9"; - sha256 = "19vqw1ba01m2wlncpycw9vj5n8741pv36hd3dy9jjdxwlzdjzyi5"; + rev = "v1.1.11"; + sha256 = "09zrnf8lk179mpqnx92zm24xl7m3bq4ca84wc2zwi5hc8kxjbwxc"; }; }; diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index efbcada62309..bc8b831eec72 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.10.3"; - sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km"; + version = "1.12.0"; + sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml"; }) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 6d29c7456974..36d6fc3a62d4 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1"; + sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"; }; nativeBuildInputs = [ python3 pkgconfig ]; |