summaryrefslogtreecommitdiff
path: root/ymir.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-02-12 23:21:02 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-02-12 23:21:02 +0100
commitc72a8c62b5cc02ef3a362fb486046b04122e3d03 (patch)
tree1650cab7b30deabf9db3f3fa965ee0367ab99390 /ymir.nix
parentd06d3dbb18c7020a59e9b75b824f1a39c93e4903 (diff)
downloadnixos-c72a8c62b5cc02ef3a362fb486046b04122e3d03.tar
nixos-c72a8c62b5cc02ef3a362fb486046b04122e3d03.tar.gz
nixos-c72a8c62b5cc02ef3a362fb486046b04122e3d03.tar.bz2
nixos-c72a8c62b5cc02ef3a362fb486046b04122e3d03.tar.xz
nixos-c72a8c62b5cc02ef3a362fb486046b04122e3d03.zip
Integrate lua5_sec deeper
Diffstat (limited to 'ymir.nix')
-rw-r--r--ymir.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/ymir.nix b/ymir.nix
index a57edeb6..ecc14a44 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -48,13 +48,13 @@ in rec {
48 nixpkgs.config.packageOverrides = pkgs: 48 nixpkgs.config.packageOverrides = pkgs:
49 rec { 49 rec {
50 prosody = pkgs.callPackage ./customized/prosody.nix ({ 50 prosody = pkgs.callPackage ./customized/prosody.nix ({
51 inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib; 51 inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;
52 luasec = pkgs.lua5_sec;
53 lua5 = pkgs.lua5_1; 52 lua5 = pkgs.lua5_1;
54 communityModules = ["mod_carbons" "mod_reload_modules"]; 53 communityModules = ["mod_carbons" "mod_reload_modules"];
55 extraModules = [prosodyAuth]; 54 extraModules = [prosodyAuth];
56 extraLibs = [luaPam luaPosix luaSha2]; 55 extraLibs = [luaPam luaPosix luaSha2];
57 }); 56 });
57 lua51Packages = lua51Packages \\ { luasec = pkgs.lua5_sec; };
58 uwsgi = pkgs.callPackage ./customized/uwsgi.nix { 58 uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
59 extraPlugins = { 59 extraPlugins = {
60 cgi = { 60 cgi = {