From 44086f2d8ca028fd39958d464fa349f65c2c4e05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:55:19 +0100 Subject: [PATCH] amber-secret: migrate to pkgs/by-name --- .../default.nix => by-name/am/amber-secret/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{tools/security/amber/default.nix => by-name/am/amber-secret/package.nix} (87%) diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/by-name/am/amber-secret/package.nix similarity index 87% rename from pkgs/tools/security/amber/default.nix rename to pkgs/by-name/am/amber-secret/package.nix index be6267925ecf..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 { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Manage secret values in-repo via public key cryptography"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73f126419bc..c3dce9b9421e 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