From 923003885813437a5f9499ddc3eac7f2c3bd2bf1 Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:36:00 +0200 Subject: [PATCH] luaPackages.toml: remove build often breaks and we dont use it in nixpkgs anymore. It was introduced for rocks.nvim which now uses toml-edit --- maintainers/scripts/luarocks-packages.csv | 1 - pkgs/development/lua-modules/aliases.nix | 1 + .../lua-modules/generated-packages.nix | 26 ------------------- pkgs/development/lua-modules/overrides.nix | 13 ---------- 4 files changed, 1 insertion(+), 40 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d4b6190f1925..68e5829779d9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -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,,,,,, diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 168cb66f8c9b..efa9a1e423cd 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -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 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c4e09b71ec02..825fbb098b21 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -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"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 34338bf96b84..af63e61fb70b 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -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 {