From aa68f56c0a6a288529bd1075b83756b4ec911532 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 20:05:20 +0300 Subject: [PATCH 1/4] nginxModules.vts: init at v0.1.18 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0910a6d05844..816d9c5c3da5 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -214,4 +214,13 @@ sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; }; }; + + vts = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-vts"; + rev = "v0.1.18"; + sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7"; + }; + }; } From ca37481d251288902004baf230a2b091fbd3d78c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 20:27:31 +0300 Subject: [PATCH 2/4] nginxModules.push-stream: init at v0.5.4 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 816d9c5c3da5..0b8d4f622250 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -161,6 +161,15 @@ inputs = [ pkgs.pam ]; }; + push-stream ={ + src = fetchFromGitHub { + owner = "wandenberg"; + repo = "nginx-push-stream-module"; + rev = "0.5.4"; + sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr"; + }; + }; + rtmp ={ src = fetchFromGitHub { owner = "arut"; From a7a7033e45d1d90ac33dca0cfe73981d2972fe2b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 21:27:48 +0300 Subject: [PATCH 3/4] msgpuck: init at v2.0 --- .../development/libraries/msgpuck/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/msgpuck/default.nix diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix new file mode 100644 index 000000000000..e177694e894e --- /dev/null +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig }: + +stdenv.mkDerivation rec { + name = "msgpuck-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "rtsisyk"; + repo = "msgpuck"; + rev = "${version}"; + sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; + homepage = https://github.com/rtsisyk/msgpuck; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f6c16e9928..6c0ad38c2263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8341,6 +8341,8 @@ with pkgs; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; + msgpuck = callPackage ../development/libraries/msgpuck { }; + msitools = callPackage ../development/tools/misc/msitools { }; multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis; From 07e7966d3b889d4c95a26491735ecfadb27b49ab Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 21:33:14 +0300 Subject: [PATCH 4/4] nginxModules.upstream-tarantool: init at v2.7 --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0b8d4f622250..9f2cd319f0e7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -224,6 +224,16 @@ }; }; + upstream-tarantool = { + src = fetchFromGitHub { + owner = "tarantool"; + repo = "nginx_upstream_module"; + rev = "v2.7"; + sha256 = "05dwj0caj910p7kan2qjvm6x2x601igryhny2xzr47hhsk5q1cnx"; + }; + inputs = [ pkgs.msgpuck.dev pkgs.yajl ]; + }; + vts = { src = fetchFromGitHub { owner = "vozlt";