diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-12-01 04:53:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 04:53:51 -0500 |
| commit | 73a6462da27fca5ecf40136d24b9d8b65010a5ea (patch) | |
| tree | f307bb6f948b5f6728073815ce204b3aac5c07e3 /pkgs/development/lua-modules | |
| parent | 91b3acaa4d054a59c5a449f67f4a595f15d8a0a2 (diff) | |
| parent | 7f36d671a126880a1c44f4ff1bc02cb199bc6fe8 (diff) | |
Merge pull request #199288 from NickCao/lua-ossl
lua-modules: unpin to openssl_1_1
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c4c22170ba35f..fe6e304d9f318 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; } ]; }); |