From 7f36d671a126880a1c44f4ff1bc02cb199bc6fe8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 3 Nov 2022 10:36:28 +0800 Subject: [PATCH] lua-modules: unpin to openssl_1_1 --- pkgs/development/lua-modules/overrides.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 5becc91699bf..c2e1cb518d6d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -27,7 +27,7 @@ , mariadb , mpfr , neovim-unwrapped -, openssl_1_1 +, openssl , pcre , pkg-config , postgresql @@ -73,8 +73,8 @@ with prev; cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ - { name = "CRYPTO"; dep = openssl_1_1; } - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "CRYPTO"; dep = openssl; } + { name = "OPENSSL"; dep = openssl; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; })).overrideAttrs (oa: rec { @@ -331,9 +331,8 @@ with prev; luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ - # https://github.com/wahern/luaossl/pull/199 - { name = "CRYPTO"; dep = openssl_1_1; } - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "CRYPTO"; dep = openssl; } + { name = "OPENSSL"; dep = openssl; } ]; }); @@ -345,7 +344,7 @@ with prev; luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: { externalDeps = [ - { name = "OPENSSL"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl; } ]; });