From 120bde5c929843e1596d03b49432dcd3158d6638 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 6 Jan 2020 17:14:19 +0100 Subject: ... --- custom/luaPam.nix | 4 ++-- custom/luaPosix.nix | 2 +- custom/luaSha2.nix | 4 ++-- 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 @@ }: let - lua = pkgs.lua52Packages.lua; -in pkgs.lua52Packages.buildLuaPackage { + lua = pkgs.lua51Packages.lua; +in pkgs.lua51Packages.buildLuaPackage { name = "lua-pam"; buildInputs = (with pkgs; [ pam ]); 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 @@ , fetchurl }: -pkgs.lua52Packages.buildLuaPackage rec { +pkgs.lua51Packages.buildLuaPackage rec { name = "luaposix-${version}"; version = "33.3.1"; 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 @@ }: let - lua = pkgs.lua52Packages.lua; -in pkgs.lua52Packages.buildLuaPackage { + lua = pkgs.lua51Packages.lua; +in pkgs.lua51Packages.buildLuaPackage { name = "luaSha2"; src = fetchurl { url = "https://luarocks.org/manifests/luarocks/sha2-0.2.0-1.src.rock"; diff --git a/ymir.nix b/ymir.nix index 2a988790..3e10d5f4 100644 --- a/ymir.nix +++ b/ymir.nix @@ -69,11 +69,11 @@ in rec { nixpkgs.overlays = [ (self: super: { prosody = self.callPackage ./customized/prosody.nix ({ - inherit (self.lua52Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi; - lua5 = pkgs.lua5_2_compat; + inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi; + lua5 = pkgs.lua5_1; withCommunityModules = ["carbons" "reload_modules" "csi" "cloud_notify" "csi_pump" "smacks" "track_muc_joins" "watchuntrusted"]; extraModules = [prosodyAuth]; - extraLibs = [luaPam luaPosix luaSha2] ++ (with self.lua52Packages; [lua-zlib]); + extraLibs = [luaPam luaPosix luaSha2] ++ (with self.lua51Packages; [lua-zlib]); }); # uwsgi = pkgs.callPackage ./customized/uwsgi.nix { # extraPlugins = { -- cgit v1.2.3