From fb67d037a6a3d6b4a4f532648a4e32e5a1747a69 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 4 Aug 2025 00:17:42 +0900 Subject: [PATCH 1/2] jsonschema-cli: don't use pname in src --- pkgs/by-name/js/jsonschema-cli/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index fbaea316afdbe..1bc6f75024285 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { version = "0.32.0"; src = fetchCrate { - inherit pname version; + pname = "jsonschema-cli"; + inherit version; hash = "sha256-ZcavZSHf2eT65f7HbtZmD2mYUtrXEL/l1opXCvdn1O0="; }; From 76c385af8d0acc6a798328cceb9aa6c2ee4807da Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 4 Aug 2025 00:20:29 +0900 Subject: [PATCH 2/2] jsonschema-cli: use finalAttrs instead of rec Removed versionCheckProgram. This attribute would have required an update in this change, but I chose to remove it since its functionality is now provided by the default. See befb2beebd2382aa9a6274b0fd609fbd872d8cc8 for detail. --- pkgs/by-name/js/jsonschema-cli/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 1bc6f75024285..37bf58ef3b377 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -6,13 +6,13 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; version = "0.32.0"; src = fetchCrate { pname = "jsonschema-cli"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-ZcavZSHf2eT65f7HbtZmD2mYUtrXEL/l1opXCvdn1O0="; }; @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; @@ -30,11 +29,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Fast command-line tool for JSON Schema validation"; homepage = "https://github.com/Stranger6667/jsonschema"; - changelog = "https://github.com/Stranger6667/jsonschema/releases/tag/rust-v${version}"; + changelog = "https://github.com/Stranger6667/jsonschema/releases/tag/rust-v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kachick ]; mainProgram = "jsonschema-cli"; }; -} +})