nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

luaPackages.toml: remove

Browse Source 
build often breaks and we dont use it in nixpkgs anymore. It was introduced for rocks.nvim which now uses toml-edit
This commit is contained in:
Matthieu C. 2024-06-25 13:36:00 +02:00
parent 293cbbb947
commit 9230038858
4 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/scripts/luarocks-packages.csv
View File

@ -136,7 +136,6 @@ telescope.nvim,,,,,5.1,
telescope-manix,,,,,,
tiktoken_core,,,,,,natsukium
tl,,,,,,mephistophiles
toml,,,,,,mrcjkb
toml-edit,,,,,5.1,mrcjkb
tree-sitter-norg,,,,,5.1,mrcjkb
vstruct,,,,,,

1 name rockspec ref server version luaversion maintainers
136 telescope-manix
137 tiktoken_core natsukium
138 tl mephistophiles
toml mrcjkb
139 toml-edit 5.1 mrcjkb
140 tree-sitter-norg 5.1 mrcjkb
141 vstruct

1
pkgs/development/lua-modules/aliases.nix
View File

@ -43,4 +43,5 @@ mapAliases {
cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18
nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16
nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17
toml = throw "toml was removed because broken. You can use toml-edit instead"; # added 2024-06-25
}

26
pkgs/development/lua-modules/generated-packages.nix
View File

@ -3233,32 +3233,6 @@ buildLuarocksPackage {
};
}) {};
toml = callPackage({ buildLuarocksPackage, cmake, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "toml";
version = "0.4.0-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/toml-0.4.0-0.rockspec";
sha256 = "17yr5gj9yyax3wzn7cv3vvkjrg5qq4yfw8sc6v72ivg79fhvwnli";
}).outPath;
src = fetchFromGitHub {
owner = "LebJe";
repo = "toml.lua";
rev = "0.4.0";
hash = "sha256-zVV49x2FW7UE1JoI88VzfYoQtkMFPiXrrAGOaNk4nok=";
};
disabled = luaOlder "5.1";
nativeBuildInputs = [ cmake ];
meta = {
homepage = "https://github.com/LebJe/toml.lua";
description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
buildLuarocksPackage {
pname = "toml-edit";

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

@ -787,19 +787,6 @@ in
nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
});
toml = prev.toml.overrideAttrs (oa: {
patches = [ ./toml.patch ];
nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ];
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \
--replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum"
'';
});
toml-edit = prev.toml-edit.overrideAttrs (oa: {
cargoDeps = rustPlatform.fetchCargoTarball {