summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2020-01-06 15:25:04 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2020-01-06 15:25:04 +0100
commitcb8b6b5b792f60406555e0d85ad6188a21439510 (patch)
treea2c121a74d28e5ad8ddb96b9c94492d60fe66a04
parentc26bce97790f8d16ab48171e3f157c73781c4ade (diff)
downloadnixos-cb8b6b5b792f60406555e0d85ad6188a21439510.tar
nixos-cb8b6b5b792f60406555e0d85ad6188a21439510.tar.gz
nixos-cb8b6b5b792f60406555e0d85ad6188a21439510.tar.bz2
nixos-cb8b6b5b792f60406555e0d85ad6188a21439510.tar.xz
nixos-cb8b6b5b792f60406555e0d85ad6188a21439510.zip
...
-rw-r--r--customized/prosody.nix4
-rw-r--r--ymir.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/customized/prosody.nix b/customized/prosody.nix
index f8633742..a30b4e16 100644
--- a/customized/prosody.nix
+++ b/customized/prosody.nix
@@ -1,6 +1,6 @@
1{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg 1{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
2, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luadbi ? null 2, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luadbi ? null
3, withLibevent ? true, withZlib ? true, withDBI ? true 3, withLibevent ? true, withDBI ? true
4, withCommunityModules ? [], extraLibs ? [], extraModules ? [] 4, withCommunityModules ? [], extraLibs ? [], extraModules ? []
5}: 5}:
6 6
@@ -12,7 +12,7 @@ with stdenv.lib;
12let 12let
13 libs = [ luasocket luasec luaexpat luafilesystem luabitop ] 13 libs = [ luasocket luasec luaexpat luafilesystem luabitop ]
14 ++ optional withLibevent luaevent 14 ++ optional withLibevent luaevent
15 ++ optional withZlib luazlib 15 ++ optional withDBI luadbi;
16 ++ extraLibs; 16 ++ extraLibs;
17 getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; 17 getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
18 getLuaPath = lib : getPath lib "lua"; 18 getLuaPath = lib : getPath lib "lua";
diff --git a/ymir.nix b/ymir.nix
index bcfadf03..e2190b57 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -69,11 +69,11 @@ in rec {
69 nixpkgs.overlays = [ 69 nixpkgs.overlays = [
70 (self: super: { 70 (self: super: {
71 prosody = self.callPackage ./customized/prosody.nix ({ 71 prosody = self.callPackage ./customized/prosody.nix ({
72 inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi; 72 inherit (self.lua52Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi;
73 lua5 = pkgs.lua5_1; 73 lua5 = pkgs.lua5_2_compat;
74 withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"]; 74 withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"];
75 extraModules = [prosodyAuth]; 75 extraModules = [prosodyAuth];
76 extraLibs = [luaPam luaPosix luaSha2]; 76 extraLibs = with self.lua52Packages; [luaPam luaPosix luaSha2 lua-zlib];
77 }); 77 });
78 # uwsgi = pkgs.callPackage ./customized/uwsgi.nix { 78 # uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
79 # extraPlugins = { 79 # extraPlugins = {