From ecaf6c6f362c0b69e7174a83dfb26a930e7b5e94 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 11 Sep 2025 08:13:35 +0200
Subject: [PATCH 1/3] amazon-ec2-net-utils: use `finalAttrs` pattern

---
 pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
index 555240b4d45a..090586b09278 100644
--- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
+++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
@@ -16,14 +16,14 @@
   util-linux,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "amazon-ec2-net-utils";
   version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "amazonlinux";
     repo = "amazon-ec2-net-utils";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-PtnRgNmVrIGndLjYjXWWx85z4oxjn637iZqXd6OSiQg=";
   };
 
@@ -121,4 +121,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ sielicki ];
   };
-}
+})

From 4498c7ac02790da7ead97c769235175a1f400db2 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 11 Sep 2025 08:14:12 +0200
Subject: [PATCH 2/3] amazon-ec2-net-utils: replace `makeWrapper` with
 `makeBinaryWrapper`

---
 pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
index 090586b09278..097824d5f2d7 100644
--- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
+++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
@@ -9,7 +9,7 @@
   gnused,
   installShellFiles,
   iproute2,
-  makeWrapper,
+  makeBinaryWrapper,
   nix-update-script,
   systemd,
   udevCheckHook,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-    makeWrapper
+    makeBinaryWrapper
     udevCheckHook
   ];
 

From ff4383683528d7bf3aa361f24b5f07b80b9b1367 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 11 Sep 2025 08:14:54 +0200
Subject: [PATCH 3/3] amazon-ec2-net-utils: replace `util-linux` with
 `util-linuxMinimal`

---
 pkgs/by-name/am/amazon-ec2-net-utils/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
index 097824d5f2d7..7d2ec3384f2f 100644
--- a/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
+++ b/pkgs/by-name/am/amazon-ec2-net-utils/package.nix
@@ -13,7 +13,7 @@
   nix-update-script,
   systemd,
   udevCheckHook,
-  util-linux,
+  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir $out
+    mkdir -p $out
 
     for file in bin/*.sh; do
       install -D -m 755 "$file" $out/bin/$(basename --suffix ".sh" "$file")
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
           gnused
           iproute2
           systemd
-          util-linux
+          util-linuxMinimal
         ]
       }