diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index c866d85ee39f..56d1e6f1bb74 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -11,6 +11,7 @@ # passthru dependencies nix-update-script, runCommand, + makeBinaryWrapper, toml-test, # Optional feature @@ -68,24 +69,46 @@ rustPlatform.buildRustPackage (finalAttrs: { # Some of the failures are reported issues, others may not be. # https://github.com/tamasfe/taplo/issues/486 skips = [ - "valid/comment/nonascii" - "valid/datetime/edge" - "valid/key/quoted-unicode" - "valid/string/quoted-unicode" - "invalid/control/multi-cr" - "invalid/control/rawmulti-cr" + "invalid/table/append-with-dotted-keys-04" "invalid/table/super-twice" + "valid/array/array" + "valid/comment/everywhere" + "valid/comment/nonascii" + "valid/datetime/datetime" + "valid/datetime/edge" + "valid/datetime/leap-year" + "valid/datetime/local" + "valid/datetime/local-date" + "valid/datetime/local-time" + "valid/datetime/milliseconds" + "valid/datetime/timezone" + "valid/example" + "valid/key/like-date" + "valid/key/numeric-04" + "valid/key/quoted-unicode" + "valid/spec-1.0.0/local-date-0" + "valid/spec-1.0.0/local-date-time-0" + "valid/spec-1.0.0/local-time-0" + "valid/spec-1.0.0/offset-date-time-0" + "valid/spec-1.0.0/offset-date-time-1" + "valid/spec-1.0.0/table-7" + "valid/spec-example-1" + "valid/spec-example-1-compact" + "valid/string/quoted-unicode" ]; in runCommand "taplo-toml-test" { nativeBuildInputs = [ - finalAttrs.finalPackage + makeBinaryWrapper toml-test ]; } '' - toml-test taplo ${lib.concatMapStringsSep " " (a: "-skip ${a}") skips} -- toml-test + makeWrapper ${lib.getExe finalAttrs.finalPackage} ./taplo-toml-test --add-flag toml-test + toml-test test -decoder=./taplo-toml-test -toml=1.0 ${ + lib.concatMapStringsSep " " (a: "-skip ${a}") skips + } touch "$out" ''; }; diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix index 14cbd6b129fe..4bda2ee23bc8 100644 --- a/pkgs/by-name/to/toml-test/package.nix +++ b/pkgs/by-name/to/toml-test/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "toml-test"; - version = "1.6.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "toml-lang"; repo = "toml-test"; tag = "v${finalAttrs.version}"; - hash = "sha256-jOFkSEDNvvx8svgyYYpAbveQsclMsQRKJ2ocA6ty1Kw="; + hash = "sha256-QJ7rK4zdPN8c728fR9r4vXnSk4Y9T/XQJulO7kQaYFE="; }; - vendorHash = "sha256-yt5rwpYzO38wEUhcyG4G367Byek20Uz3u+buAazq/5A="; + vendorHash = "sha256-aIGcv6qAQC3URQ/WIvg/+nRyrw1N2q5uBVpRH4fwgXk="; ldflags = [ "-s" @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; + versionCheckProgramArg = "version"; doInstallCheck = true; passthru.updateScript = nix-update-script { };