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

luaPackages.toml-edit: 0.1.5-1 -> 0.3.6-1

This commit is contained in:
Marc Jakobi 2024-04-12 15:54:25 +02:00 committed by Matthieu Coudron
parent 5a051661ee
commit 28555cdd35
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3636,30 +3636,21 @@ buildLuarocksPackage {
};
}) {};
toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }:
toml-edit = callPackage({ buildLuarocksPackage, fetchzip, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "toml-edit";
version = "0.1.5-1";
version = "0.3.6-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/toml-edit-0.1.5-1.rockspec";
sha256 = "1xgjh8x44kn24vc29si811zq2a7pr24zqj4w07pys5k6ccnv26qz";
url = "mirror://luarocks/toml-edit-0.3.6-1.rockspec";
sha256 = "18fw256vzvfavfwrnzm507k4h3x2lx9l93ghr1ggsi4mhsnjki46";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/vhyrro/toml-edit.lua",
"rev": "34f072d8ff054b3124d9d2efc0263028d7425525",
"date": "2023-12-29T15:53:36+01:00",
"path": "/nix/store/z1gn59hz9ypk3icn3gmafaa19nzx7a1v-toml-edit.lua",
"sha256": "0jzzp4sd48haq1kmh2k85gkygfq39i10kvgjyqffcrv3frdihxvx",
"hash": "sha256-fXcYW3ZjZ+Yc9vLtCUJMA7vn5ytoClhnwAoi0jS5/0s=",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path" "sha256"]) ;
src = fetchzip {
url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.3.6.zip";
sha256 = "19v6axraj2n22lmilfr4x9nr40kcjb6wnpsfhf1mh2zy9nsd6ji6";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua luarocks-build-rust-mlua ];
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/vhyrro/toml-edit.lua";

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

@ -685,10 +685,18 @@ in
cargoDeps = rustPlatform.fetchCargoTarball {
src = oa.src;
hash = "sha256-gvUqkLOa0WvAK4GcTkufr0lC2BOs2FQ2bgFpB0qa47k=";
hash = "sha256-2P+mokkjdj2PccQG/kAGnIoUPVnK2FqNfYpHPhsp8kw=";
};
nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
nativeBuildInputs = let
# HACK: luarocks-nix doesn't pick up rockspec build dependencies,
# so we have to pass the correct package in here.
lua = lib.head oa.propagatedBuildInputs;
in oa.nativeBuildInputs ++ [
cargo
rustPlatform.cargoSetupHook
lua.pkgs.luarocks-build-rust-mlua
];
});