cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #309762 from GaetanLepage/luasnip

Browse source 
luaPackages.luasnip: 2.2.0-1 -> 2.3.0-1
This commit is contained in:
Pol Dellaiera 2024-05-10 10:53:25 +02:00 committed by GitHub
commit 3fe064a63f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/lua-modules/generated-packages.nix
View file

@ -2392,14 +2392,14 @@ buildLuarocksPackage {
luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }: luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }:
buildLuarocksPackage { buildLuarocksPackage {
pname = "luasnip"; pname = "luasnip";
version = "2.2.0-1"; version = "2.3.0-1";
knownRockspec = (fetchurl { knownRockspec = (fetchurl {
url = "mirror://luarocks/luasnip-2.2.0-1.rockspec"; url = "mirror://luarocks/luasnip-2.3.0-1.rockspec";
sha256 = "08q98dficqzrq0jd8iqbpij9ywv2q4bm2k8l3s3spfvwqhm93zrp"; sha256 = "022srpvwwbms8i97mdhkwq0yg0pfjm7a6673iyf7cr1xj15pq23v";
}).outPath; }).outPath;
src = fetchzip { src = fetchzip {
url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.2.0.zip"; url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.3.0.zip";
sha256 = "05d5ks3g6a9dl3bmap8m60hnx3hc4acvcp2jzkw85r4anaawl45b"; sha256 = "0bbackpym8k11gm32iwwzqjnqanpralanfjkl4lrs33xl7lsylqk";
}; };
disabled = (luaOlder "5.1"); disabled = (luaOlder "5.1");

8
pkgs/development/lua-modules/overrides.nix
View file

@ -383,14 +383,6 @@ in
]; ];
}); });
luasnip = prev.luasnip.overrideAttrs (_: {
# Until https://github.com/L3MON4D3/LuaSnip/issues/1139 is solved
postConfigure = ''
substituteInPlace ''${rockspecFilename} \
--replace "'jsregexp >= 0.0.5, <= 0.0.6'" "'jsregexp >= 0.0.5'"
'';
});
luaossl = prev.luaossl.overrideAttrs (_: { luaossl = prev.luaossl.overrideAttrs (_: {
externalDeps = [ externalDeps = [
{ name = "CRYPTO"; dep = openssl; } { name = "CRYPTO"; dep = openssl; }