diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-14 17:28:37 +0100 |
| commit | e100119827474928636c2ed9a9772f3c5107663b (patch) | |
| tree | 80833a41f9f067125fea734b134b0a9424fd7159 /customized | |
| parent | 000d46fbd462dc59aa143261b894f9c470e54040 (diff) | |
| parent | f655f88cbbc334ad56a79c2287f18defa5aa98ba (diff) | |
| download | nixos-e100119827474928636c2ed9a9772f3c5107663b.tar nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.gz nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.bz2 nixos-e100119827474928636c2ed9a9772f3c5107663b.tar.xz nixos-e100119827474928636c2ed9a9772f3c5107663b.zip | |
Merge branch 'master' of git:nixos
Diffstat (limited to 'customized')
| -rw-r--r-- | customized/prosody.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/customized/prosody.nix b/customized/prosody.nix index a3445517..2a23b651 100644 --- a/customized/prosody.nix +++ b/customized/prosody.nix | |||
| @@ -21,7 +21,7 @@ let | |||
| 21 | 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"; | 21 | 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"; |
| 22 | luaPath = concatStringsSep ";" (map getLuaPath libs); | 22 | luaPath = concatStringsSep ";" (map getLuaPath libs); |
| 23 | luaCPath = concatStringsSep ";" (map getLuaCPath libs); | 23 | luaCPath = concatStringsSep ";" (map getLuaCPath libs); |
| 24 | copyModules = concatStringsSep ";" (map copyModule (communityModules ++ ["mod_websocket"])); | 24 | copyModules = concatStringsSep ";" (map copyModule communityModules); |
| 25 | copyExtraModules = concatStringsSep ";" (map copyExtraModule extraModules); | 25 | copyExtraModules = concatStringsSep ";" (map copyExtraModule extraModules); |
| 26 | in | 26 | in |
| 27 | 27 | ||
| @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { | |||
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | communityModules = fetchhg { | 37 | communityModules = fetchhg { |
| 38 | url = "http://prosody-modules.googlecode.com/hg/"; | 38 | url = "https://hg.prosody.im/prosody-modules/"; |
| 39 | rev = "4b55110b0aa8"; | 39 | rev = "5ca2470a7755"; |
| 40 | sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; | 40 | sha256 = "06f3ndj15zhjwx8vjdyn73h3minw9wb37l9r753h6db56db2c0zl"; |
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] | 43 | buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] |