From 717b4bf39598032d69bf95ff619238e5621bcd63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:54:56 +0100
Subject: [PATCH 1/3] amber-secret: add changelog to meta

---
 pkgs/tools/security/amber/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix
index d95e21c954df..ef0fc819f75e 100644
--- a/pkgs/tools/security/amber/default.nix
+++ b/pkgs/tools/security/amber/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     owner = "fpco";
     repo = "amber";
     rev = "v${version}";
-    sha256 = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
+    hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
   };
 
   cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo=";
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Manage secret values in-repo via public key cryptography";
     homepage = "https://github.com/fpco/amber";
+    changelog = "https://github.com/fpco/amber/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ psibi ];
     mainProgram = "amber";

From c543543901b06ef3317f2925322993d791c2966e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Jan 2025 09:52:10 +0100
Subject: [PATCH 2/3] amber-secret: remove with lib;

---
 pkgs/tools/security/amber/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix
index ef0fc819f75e..be6267925ecf 100644
--- a/pkgs/tools/security/amber/default.nix
+++ b/pkgs/tools/security/amber/default.nix
@@ -22,12 +22,12 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
 
-  meta = with lib; {
+  meta = {
     description = "Manage secret values in-repo via public key cryptography";
     homepage = "https://github.com/fpco/amber";
     changelog = "https://github.com/fpco/amber/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ psibi ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ psibi ];
     mainProgram = "amber";
   };
 }

From 44086f2d8ca028fd39958d464fa349f65c2c4e05 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 9 Jan 2025 09:55:19 +0100
Subject: [PATCH 3/3] 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