diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-05-29 10:46:43 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-05-29 10:46:43 +0200 |
commit | d783452549c458726a62e2d18f5a3d8d396bf6e6 (patch) | |
tree | 3845bf4171a294dc2f334d52082d756d51e77809 | |
parent | 2454309ccedeee520851239b7fb3375837ab8db1 (diff) | |
download | nixos-d783452549c458726a62e2d18f5a3d8d396bf6e6.tar nixos-d783452549c458726a62e2d18f5a3d8d396bf6e6.tar.gz nixos-d783452549c458726a62e2d18f5a3d8d396bf6e6.tar.bz2 nixos-d783452549c458726a62e2d18f5a3d8d396bf6e6.tar.xz nixos-d783452549c458726a62e2d18f5a3d8d396bf6e6.zip |
luasec migrated into luaPackages
-rw-r--r-- | ymir.nix | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -48,14 +48,12 @@ 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 luaexpat luafilesystem luabitop luaevent luazlib luasec; |
52 | luasec = lua5_sec; | ||
53 | lua5 = pkgs.lua5_1; | 52 | lua5 = pkgs.lua5_1; |
54 | communityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins"]; | 53 | communityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins"]; |
55 | extraModules = [prosodyAuth]; | 54 | extraModules = [prosodyAuth]; |
56 | extraLibs = [luaPam luaPosix luaSha2]; | 55 | extraLibs = [luaPam luaPosix luaSha2]; |
57 | }); | 56 | }); |
58 | # lua5_sec = pkgs.lua5_sec.override { lua5 = pkgs.lua5_1; }; | ||
59 | uwsgi = pkgs.callPackage ./customized/uwsgi.nix { | 57 | uwsgi = pkgs.callPackage ./customized/uwsgi.nix { |
60 | extraPlugins = { | 58 | extraPlugins = { |
61 | cgi = { | 59 | cgi = { |