From 178b701ef353e35d47f22df0bc86f05b222c358e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:53:01 +0100
Subject: [PATCH 1/3] darwin.iproute2mac: format with nixfmt

---
 pkgs/os-specific/darwin/iproute2mac/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index c7582de3352a..ae0a4dfbbea9 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, darwin, python3 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  darwin,
+  python3,
+}:
 
 stdenv.mkDerivation rec {
   version = "1.4.1";

From bcda866739d27fee82fbcfc40cbc565278d79991 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:54:11 +0100
Subject: [PATCH 2/3] darwin.iproute2mac: refactor

---
 .../darwin/iproute2mac/default.nix            | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index ae0a4dfbbea9..b18f109e4022 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -14,30 +14,35 @@ stdenv.mkDerivation rec {
     owner = "brona";
     repo = "iproute2mac";
     rev = "v${version}";
-    sha256 = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
+    hash = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
   };
 
   buildInputs = [ python3 ];
 
   postPatch = ''
     substituteInPlace src/ip.py \
-      --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
-      --replace /sbin/route ${darwin.network_cmds}/bin/route \
-      --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
-      --replace /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
-      --replace /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
-      --replace /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    install -D -m 755 src/ip.py $out/bin/ip
+      --replace-fail /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
+      --replace-fail /sbin/route ${darwin.network_cmds}/bin/route \
+      --replace-fail /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
+      --replace-fail /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
+      --replace-fail /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
+      --replace-fail /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
   '';
 
-  meta = with lib; {
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -D -m 755 src/ip.py $out/bin/ip
+
+    runHook postInstall
+  '';
+
+  meta = {
     homepage = "https://github.com/brona/iproute2mac";
     description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jiegec ];
-    platforms = platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jiegec ];
+    platforms = lib.platforms.darwin;
   };
 }

From 4bc254a7308259e0365f1fc7ffa76fffe59e8ee2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:57:25 +0100
Subject: [PATCH 3/3] darwin.iproute2mac: 1.4.1 -> 1.5.4

---
 pkgs/os-specific/darwin/iproute2mac/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index b18f109e4022..8149580703c8 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -3,24 +3,27 @@
   stdenv,
   fetchFromGitHub,
   darwin,
+  makeWrapper,
   python3,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.5.4";
   pname = "iproute2mac";
 
   src = fetchFromGitHub {
     owner = "brona";
     repo = "iproute2mac";
     rev = "v${version}";
-    hash = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
+    hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [ python3 ];
 
   postPatch = ''
-    substituteInPlace src/ip.py \
+    substituteInPlace src/iproute2mac.py \
       --replace-fail /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
       --replace-fail /sbin/route ${darwin.network_cmds}/bin/route \
       --replace-fail /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
@@ -32,8 +35,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    install -D -m 755 src/ip.py $out/bin/ip
+    mkdir -p $out/bin $out/libexec
+    install -D -m 755 src/iproute2mac.py $out/libexec/iproute2mac.py
+    install -D -m 755 src/ip.py $out/libexec/ip
+    install -D -m 755 src/bridge.py $out/libexec/bridge
+    makeWrapper $out/libexec/ip $out/bin/ip
+    makeWrapper $out/libexec/bridge $out/bin/bridge
 
     runHook postInstall
   '';