From c407ca6392b694f3e1cf89166a568a19171638f4 Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Wed, 22 Oct 2025 23:36:35 -0400
Subject: [PATCH 1/3] maintainers: add er0k

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94f4899b4d51b..e9507ed73db1a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7715,6 +7715,13 @@
     githubId = 3422442;
     name = "Ruben Maher";
   };
+  er0k = {
+    email = "er0k@er0k.net";
+    github = "er0k";
+    githubId = 916239;
+    name = "er0k";
+    keys = [ { fingerprint = "60DE 4570 2E31 81A2 AF87  F075 B005 BA3C 8EE8 108D"; } ];
+  };
   eraserhd = {
     email = "jason.m.felice@gmail.com";
     github = "eraserhd";

From 0b0687eb89862c86889212d43ef5a7193c46083d Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Wed, 22 Oct 2025 19:12:05 -0400
Subject: [PATCH 2/3] aws-vault: 7.2.0 -> 7.7.5, switch to maintained fork

fixes https://github.com/NixOS/nixpkgs/issues/454530

see also:
- https://github.com/Homebrew/homebrew-core/pull/226185
- https://github.com/99designs/aws-vault/issues/1269
- https://github.com/99designs/aws-vault/pull/1270
- https://github.com/ByteNess/aws-vault/releases
---
 pkgs/by-name/aw/aws-vault/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index 4a84309316c6d..1b8f289f9c3ef 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -9,16 +9,17 @@
 }:
 buildGoModule rec {
   pname = "aws-vault";
-  version = "7.2.0";
+  version = "7.7.5";
 
   src = fetchFromGitHub {
-    owner = "99designs";
+    owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${version}";
-    hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c=";
+    hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA=";
   };
 
-  vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s=";
+  proxyVendor = true;
+  vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -55,8 +56,11 @@ buildGoModule rec {
   meta = with lib; {
     description = "Vault for securely storing and accessing AWS credentials in development environments";
     mainProgram = "aws-vault";
-    homepage = "https://github.com/99designs/aws-vault";
+    homepage = "https://github.com/ByteNess/aws-vault";
     license = licenses.mit;
-    maintainers = with maintainers; [ zimbatm ];
+    maintainers = with maintainers; [
+      zimbatm
+      er0k
+    ];
   };
 }

From b531698d03a340441f2229fab95ba850045256a8 Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Thu, 23 Oct 2025 16:12:31 -0400
Subject: [PATCH 3/3] aws-vault: disable cgo

---
 pkgs/by-name/aw/aws-vault/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index 1b8f289f9c3ef..f571c25b97825 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -26,6 +26,8 @@ buildGoModule rec {
     makeWrapper
   ];
 
+  env.CGO_ENABLED = "0";
+
   postInstall = ''
     # make xdg-open overrideable at runtime
     # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links