From 3441c3be20d3f9c6b64f89b4ef8a94f32acbad25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jan 2025 10:59:41 +0100 Subject: [PATCH] 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; };