From 15d849e26e55b34c3b4a1a18853c304786857b22 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:56:36 +0100 Subject: [PATCH 1/5] taplo: use finalAttrs pattern --- pkgs/by-name/ta/taplo/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 6594a78872ae..e93c892d6cbd 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -9,12 +9,12 @@ installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "taplo"; version = "0.10.0"; src = fetchCrate { - inherit version; + inherit (finalAttrs) version; pname = "taplo-cli"; hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c="; }; @@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; buildFeatures = lib.optional withLsp "lsp"; @@ -54,4 +52,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "taplo"; }; -} +}) From 92671b275b4d3f369abc1838856954dbb80cfdad Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 14:47:34 +0100 Subject: [PATCH 2/5] taplo: remove `with lib;` --- pkgs/by-name/ta/taplo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index e93c892d6cbd..5380ba690547 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -45,10 +45,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/taplo completions zsh) ''; - meta = with lib; { + meta = { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "taplo"; }; From 9437f10f613d32eae8dff0f9c76adaadf7ca6185 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 14:48:15 +0100 Subject: [PATCH 3/5] taplo: add versionCheckHook --- pkgs/by-name/ta/taplo/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 5380ba690547..7ef4800ba1c3 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -7,6 +7,7 @@ openssl, withLsp ? true, installShellFiles, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/taplo completions zsh) ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; From 533e31e26b1fac6f751996476b41dd28f3d68b8a Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 14:48:48 +0100 Subject: [PATCH 4/5] taplo: add updateScript --- pkgs/by-name/ta/taplo/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 7ef4800ba1c3..b0d1e2a22329 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -8,6 +8,7 @@ withLsp ? true, installShellFiles, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; From c8b6a04378e7634daa2307f93daf246697cda870 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 4 Nov 2025 13:07:00 +0100 Subject: [PATCH 5/5] taplo: add defelo to maintainers --- pkgs/by-name/ta/taplo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index b0d1e2a22329..c50de7ee18ca 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ defelo ]; mainProgram = "taplo"; }; })