colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #199288 from NickCao/lua-ossl

Browse Source 
lua-modules: unpin to openssl_1_1
This commit is contained in:
Mario Rodas 2022-12-01 04:53:51 -05:00 committed by GitHub
commit 73a6462da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/lua-modules/overrides.nix
View File

@ -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; }
];
});