From e53c05f347749e95ed443443d3fc0ee35fee504b Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 12 Feb 2017 23:22:57 +0100 Subject: Revert "Integrate lua5_sec deeper" This reverts commit c72a8c62b5cc02ef3a362fb486046b04122e3d03. --- ymir.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ymir.nix b/ymir.nix index ecc14a44..a57edeb6 100644 --- a/ymir.nix +++ b/ymir.nix @@ -48,13 +48,13 @@ in rec { nixpkgs.config.packageOverrides = pkgs: rec { prosody = pkgs.callPackage ./customized/prosody.nix ({ - inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; + inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib; + luasec = pkgs.lua5_sec; lua5 = pkgs.lua5_1; communityModules = ["mod_carbons" "mod_reload_modules"]; extraModules = [prosodyAuth]; extraLibs = [luaPam luaPosix luaSha2]; }); - lua51Packages = lua51Packages \\ { luasec = pkgs.lua5_sec; }; uwsgi = pkgs.callPackage ./customized/uwsgi.nix { extraPlugins = { cgi = { -- cgit v1.2.3