From cf92c8d096fac5cbe786bf1cbe69a7806e2f0d7e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:12:35 +0100 Subject: Link prosody against lua5_sec --- customized/prosody.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'customized') diff --git a/customized/prosody.nix b/customized/prosody.nix index a3445517..c7ca03c5 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg -, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null +, lua5, luasocket, lua5_sec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null , withLibevent ? true, withZlib ? true , communityModules ? [], extraLibs ? [], extraModules ? [] }: @@ -10,7 +10,7 @@ assert withZlib -> luazlib != null; with stdenv.lib; let - libs = [ luasocket luasec luaexpat luafilesystem luabitop ] + libs = [ luasocket lua5_sec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent ++ optional withZlib luazlib ++ extraLibs; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; }; - buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] + buildInputs = [ lua5 luasocket lua5_sec luaexpat luabitop libidn openssl makeWrapper ] ++ optional withLibevent luaevent ++ optional withZlib luazlib; -- cgit v1.2.3 From d06d3dbb18c7020a59e9b75b824f1a39c93e4903 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:13:44 +0100 Subject: Do last commit properly --- customized/prosody.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'customized') diff --git a/customized/prosody.nix b/customized/prosody.nix index c7ca03c5..a3445517 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg -, lua5, luasocket, lua5_sec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null +, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null , withLibevent ? true, withZlib ? true , communityModules ? [], extraLibs ? [], extraModules ? [] }: @@ -10,7 +10,7 @@ assert withZlib -> luazlib != null; with stdenv.lib; let - libs = [ luasocket lua5_sec luaexpat luafilesystem luabitop ] + libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent ++ optional withZlib luazlib ++ extraLibs; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; }; - buildInputs = [ lua5 luasocket lua5_sec luaexpat luabitop libidn openssl makeWrapper ] + buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] ++ optional withLibevent luaevent ++ optional withZlib luazlib; -- cgit v1.2.3 From 4707cdf9ff5f19052bfb9cc0fb4792a7d266cd05 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:31:41 +0100 Subject: Bump prosody community modules --- customized/prosody.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'customized') diff --git a/customized/prosody.nix b/customized/prosody.nix index a3445517..816d6b5e 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { }; communityModules = fetchhg { - url = "http://prosody-modules.googlecode.com/hg/"; - rev = "4b55110b0aa8"; - sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; + url = "https://hg.prosody.im/prosody-modules/"; + rev = "5ca2470a7755"; + sha256 = "06f3ndj15zhjwx8vjdyn73h3minw9wb37l9r753h6db56db2c0zl"; }; buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] -- cgit v1.2.3 From 15ae61a74fddba1a8205ed5e2f84e18787c9f7f9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:33:22 +0100 Subject: No more mod_websocket? --- customized/prosody.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'customized') diff --git a/customized/prosody.nix b/customized/prosody.nix index 816d6b5e..2a23b651 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix @@ -21,7 +21,7 @@ let copyExtraModule = path: "n=0; for i in ${path}/*; do n=1; done; if [[ $n -gt 0 ]]; then cp -rv ${path}/* $out/lib/prosody/modules/; fi"; luaPath = concatStringsSep ";" (map getLuaPath libs); luaCPath = concatStringsSep ";" (map getLuaCPath libs); - copyModules = concatStringsSep ";" (map copyModule (communityModules ++ ["mod_websocket"])); + copyModules = concatStringsSep ";" (map copyModule communityModules); copyExtraModules = concatStringsSep ";" (map copyExtraModule extraModules); in -- cgit v1.2.3