From c447792f28bd3bf3c2c8af2eef99539bb3acb65e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jan 2025 22:08:26 +0100 Subject: [PATCH 1/4] jwt-cli: refactor --- pkgs/tools/security/jwt-cli/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 561dc0b50f2d..9fc3f9c84416 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mike-engel"; - repo = pname; - rev = version; - sha256 = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; + repo = "jwt-cli"; + tag = version; + hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; }; cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ @@ -41,7 +41,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; - license = with licenses; [ mit ]; + changelog = "https://github.com/mike-engel/jwt-cli/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ rycee ]; mainProgram = "jwt"; }; From 64f7305e3b4c7fd872870d08a2827e63766bac20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:11:00 +0100 Subject: [PATCH 2/4] jwt-cli: remove with lib; --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 9fc3f9c84416..06082f4d8101 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { | grep -q 'John Doe' ''; - meta = with lib; { + meta = { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; changelog = "https://github.com/mike-engel/jwt-cli/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ rycee ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rycee ]; mainProgram = "jwt"; }; } From 5bbeabe20c92b39d2a7cd1b4104fe5fb75930747 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:33:01 +0100 Subject: [PATCH 3/4] jwt-cli: add passthru.updateScript --- pkgs/tools/security/jwt-cli/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 06082f4d8101..1f84fd3dd7be 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + gitUpdater, installShellFiles, rustPlatform, Security, @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { | grep -q 'John Doe' ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; From 3441c3be20d3f9c6b64f89b4ef8a94f32acbad25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 10:59:41 +0100 Subject: [PATCH 4/4] jwt-cli: migrate to pkgs/by-name --- .../jwt-cli/default.nix => by-name/jw/jwt-cli/package.nix} | 4 +--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) rename pkgs/{tools/security/jwt-cli/default.nix => by-name/jw/jwt-cli/package.nix} (94%) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/by-name/jw/jwt-cli/package.nix similarity index 94% rename from pkgs/tools/security/jwt-cli/default.nix rename to pkgs/by-name/jw/jwt-cli/package.nix index 1f84fd3dd7be..0b73b4485d27 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/by-name/jw/jwt-cli/package.nix @@ -5,7 +5,6 @@ gitUpdater, installShellFiles, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,8 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ --bash <($out/bin/jwt completion bash) \ @@ -33,6 +30,7 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; + installCheckPhase = '' $out/bin/jwt --version > /dev/null $out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3327d4a79f0b..5697afa3eac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2399,10 +2399,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; - jwt-cli = callPackage ../tools/security/jwt-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - kaldi = callPackage ../tools/audio/kaldi { inherit (darwin.apple_sdk.frameworks) Accelerate; };