diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/by-name/am/amber-secret/package.nix similarity index 61% rename from pkgs/tools/security/amber/default.nix rename to pkgs/by-name/am/amber-secret/package.nix index d95e21c954df..d4d60e9669b9 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, - rustPlatform, + darwin, fetchFromGitHub, - Security, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -15,18 +15,19 @@ rustPlatform.buildRustPackage rec { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; + hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; }; cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = with lib; { + meta = { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; - license = licenses.mit; - maintainers = with maintainers; [ psibi ]; + changelog = "https://github.com/fpco/amber/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; mainProgram = "amber"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 819fae35804e..b02b4d6b4474 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,10 +1582,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amber-secret = callPackage ../tools/security/amber { - inherit (darwin.apple_sdk.frameworks) Security; - }; - inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13