From bc519cfdb8c61ddbf8e5fc427fb504e529913291 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:33:16 +0200 Subject: [PATCH 1/6] jnv: use finalAttrs pattern --- pkgs/by-name/jn/jnv/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index e42b7fb671f9..908956c6dc9a 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -5,14 +5,15 @@ stdenv, darwin, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "jnv"; version = "0.6.0"; src = fetchFromGitHub { owner = "ynqa"; repo = "jnv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM="; }; @@ -37,4 +38,4 @@ rustPlatform.buildRustPackage rec { nshalman ]; }; -} +}) From a8300afe2dbfe36d72f9089434b50f648375d327 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:33:34 +0200 Subject: [PATCH 2/6] jnv: use tag in fetchFromGitHub --- pkgs/by-name/jn/jnv/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 908956c6dc9a..a59702ed9ad7 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "ynqa"; repo = "jnv"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM="; }; From c197699159fd1ed3cd3be0cab664a67853c91952 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:34:34 +0200 Subject: [PATCH 3/6] jnv: remove `with lib;` --- pkgs/by-name/jn/jnv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index a59702ed9ad7..42b0d20bb625 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ); - meta = with lib; { + meta = { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; homepage = "https://github.com/ynqa/jnv"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ nealfennimore nshalman ]; From afcb71c4817cddc454fdeb13d5801069b206c1ef Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:48:43 +0200 Subject: [PATCH 4/6] jnv: remove obsolete buildInputs --- pkgs/by-name/jn/jnv/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 42b0d20bb625..1b03847a1c83 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - AppKit - ] - ); - meta = { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; From 2843b39e60c86fd9962bc2e208b7e2df12aebc3e Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:50:44 +0200 Subject: [PATCH 5/6] jnv: add versionCheckHook --- pkgs/by-name/jn/jnv/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 1b03847a1c83..b5b4140e1b31 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -18,6 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI="; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; From 5b86a3c7cbb0b79577807c7c59a4edc5f4119965 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 1 Apr 2025 21:50:56 +0200 Subject: [PATCH 6/6] jnv: add updateScript --- pkgs/by-name/jn/jnv/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index b5b4140e1b31..819bbeb3abd5 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -23,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Interactive JSON filter using jq"; mainProgram = "jnv";