diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-02-12 23:22:57 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-02-12 23:22:57 +0100 |
commit | e53c05f347749e95ed443443d3fc0ee35fee504b (patch) | |
tree | feeda0141c0ffdf1a5d82af1ba5a35ed8863ab66 | |
parent | 97c83f6733817691c02dbb8bed8b884c401283fd (diff) | |
download | nixos-e53c05f347749e95ed443443d3fc0ee35fee504b.tar nixos-e53c05f347749e95ed443443d3fc0ee35fee504b.tar.gz nixos-e53c05f347749e95ed443443d3fc0ee35fee504b.tar.bz2 nixos-e53c05f347749e95ed443443d3fc0ee35fee504b.tar.xz nixos-e53c05f347749e95ed443443d3fc0ee35fee504b.zip |
Revert "Integrate lua5_sec deeper"
This reverts commit c72a8c62b5cc02ef3a362fb486046b04122e3d03.
-rw-r--r-- | ymir.nix | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 luasec luaexpat luafilesystem luabitop luaevent luazlib; | 51 | inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib; |
52 | luasec = pkgs.lua5_sec; | ||
52 | lua5 = pkgs.lua5_1; | 53 | lua5 = pkgs.lua5_1; |
53 | communityModules = ["mod_carbons" "mod_reload_modules"]; | 54 | communityModules = ["mod_carbons" "mod_reload_modules"]; |
54 | extraModules = [prosodyAuth]; | 55 | extraModules = [prosodyAuth]; |
55 | extraLibs = [luaPam luaPosix luaSha2]; | 56 | extraLibs = [luaPam luaPosix luaSha2]; |
56 | }); | 57 | }); |
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 = { |