diff options
-rw-r--r-- | custom/luaPam.nix | 4 | ||||
-rw-r--r-- | custom/luaPosix.nix | 2 | ||||
-rw-r--r-- | custom/luaSha2.nix | 4 | ||||
-rw-r--r-- | ymir.nix | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/custom/luaPam.nix b/custom/luaPam.nix index d3727e2f..0072d70c 100644 --- a/custom/luaPam.nix +++ b/custom/luaPam.nix | |||
@@ -4,8 +4,8 @@ | |||
4 | }: | 4 | }: |
5 | 5 | ||
6 | let | 6 | let |
7 | lua = pkgs.lua52Packages.lua; | 7 | lua = pkgs.lua51Packages.lua; |
8 | in pkgs.lua52Packages.buildLuaPackage { | 8 | in pkgs.lua51Packages.buildLuaPackage { |
9 | name = "lua-pam"; | 9 | name = "lua-pam"; |
10 | buildInputs = (with pkgs; [ pam ]); | 10 | buildInputs = (with pkgs; [ pam ]); |
11 | src = fetchgit { | 11 | src = fetchgit { |
diff --git a/custom/luaPosix.nix b/custom/luaPosix.nix index 4ad92c69..24bb6131 100644 --- a/custom/luaPosix.nix +++ b/custom/luaPosix.nix | |||
@@ -3,7 +3,7 @@ | |||
3 | , fetchurl | 3 | , fetchurl |
4 | }: | 4 | }: |
5 | 5 | ||
6 | pkgs.lua52Packages.buildLuaPackage rec { | 6 | pkgs.lua51Packages.buildLuaPackage rec { |
7 | name = "luaposix-${version}"; | 7 | name = "luaposix-${version}"; |
8 | version = "33.3.1"; | 8 | version = "33.3.1"; |
9 | buildInputs = (with pkgs; [ perl ]); | 9 | buildInputs = (with pkgs; [ perl ]); |
diff --git a/custom/luaSha2.nix b/custom/luaSha2.nix index 363a2537..2270c48a 100644 --- a/custom/luaSha2.nix +++ b/custom/luaSha2.nix | |||
@@ -4,8 +4,8 @@ | |||
4 | }: | 4 | }: |
5 | 5 | ||
6 | let | 6 | let |
7 | lua = pkgs.lua52Packages.lua; | 7 | lua = pkgs.lua51Packages.lua; |
8 | in pkgs.lua52Packages.buildLuaPackage { | 8 | in pkgs.lua51Packages.buildLuaPackage { |
9 | name = "luaSha2"; | 9 | name = "luaSha2"; |
10 | src = fetchurl { | 10 | src = fetchurl { |
11 | url = "https://luarocks.org/manifests/luarocks/sha2-0.2.0-1.src.rock"; | 11 | url = "https://luarocks.org/manifests/luarocks/sha2-0.2.0-1.src.rock"; |
@@ -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.lua52Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi; | 72 | inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi; |
73 | lua5 = pkgs.lua5_2_compat; | 73 | lua5 = pkgs.lua5_1; |
74 | withCommunityModules = ["carbons" "reload_modules" "csi" "cloud_notify" "csi_pump" "smacks" "track_muc_joins" "watchuntrusted"]; | 74 | withCommunityModules = ["carbons" "reload_modules" "csi" "cloud_notify" "csi_pump" "smacks" "track_muc_joins" "watchuntrusted"]; |
75 | extraModules = [prosodyAuth]; | 75 | extraModules = [prosodyAuth]; |
76 | extraLibs = [luaPam luaPosix luaSha2] ++ (with self.lua52Packages; [lua-zlib]); | 76 | extraLibs = [luaPam luaPosix luaSha2] ++ (with self.lua51Packages; [lua-zlib]); |
77 | }); | 77 | }); |
78 | # uwsgi = pkgs.callPackage ./customized/uwsgi.nix { | 78 | # uwsgi = pkgs.callPackage ./customized/uwsgi.nix { |
79 | # extraPlugins = { | 79 | # extraPlugins = { |