diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-10 10:53:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 10:53:25 +0200 |
| commit | 3fe064a63f43cc9a71c13cb5ccf04ea5153cbcff (patch) | |
| tree | 63a1506ac11bb2409390daec0b5b2bb127d80d19 /pkgs/development/lua-modules | |
| parent | 898b04a761f5d74032f017b4dafd0511091c5a3e (diff) | |
| parent | 23e470c352f25b6a41c83b4c48d15062a2fad029 (diff) | |
Merge pull request #309762 from GaetanLepage/luasnip
luaPackages.luasnip: 2.2.0-1 -> 2.3.0-1
Diffstat (limited to 'pkgs/development/lua-modules')
| -rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 0c8214d3da268..178dacd0b3fbe 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2392,14 +2392,14 @@ buildLuarocksPackage { luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }: buildLuarocksPackage { pname = "luasnip"; - version = "2.2.0-1"; + version = "2.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasnip-2.2.0-1.rockspec"; - sha256 = "08q98dficqzrq0jd8iqbpij9ywv2q4bm2k8l3s3spfvwqhm93zrp"; + url = "mirror://luarocks/luasnip-2.3.0-1.rockspec"; + sha256 = "022srpvwwbms8i97mdhkwq0yg0pfjm7a6673iyf7cr1xj15pq23v"; }).outPath; src = fetchzip { - url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.2.0.zip"; - sha256 = "05d5ks3g6a9dl3bmap8m60hnx3hc4acvcp2jzkw85r4anaawl45b"; + url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.3.0.zip"; + sha256 = "0bbackpym8k11gm32iwwzqjnqanpralanfjkl4lrs33xl7lsylqk"; }; disabled = (luaOlder "5.1"); diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index f022aa6172dbb..cb06785e048fb 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -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 (_: { externalDeps = [ { name = "CRYPTO"; dep = openssl; } |