From 69ed950c468f808e1b5ed3326d592d77ca625f02 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 20:13:19 +0200
Subject: [PATCH 1/4] ubridge: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../ub/ubridge/package.nix}                   | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 18 deletions(-)
 rename pkgs/{tools/networking/ubridge/default.nix => by-name/ub/ubridge/package.nix} (70%)

diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/by-name/ub/ubridge/package.nix
similarity index 70%
rename from pkgs/tools/networking/ubridge/default.nix
rename to pkgs/by-name/ub/ubridge/package.nix
index 085ee4f76d0a..d52d32fa881f 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, libpcap
-, testers
-, ubridge
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libpcap,
+  testers,
+  ubridge,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,14 +14,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "ubridge";
-    rev = "v${version}";
-    sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Vo57Yw5E4AdUt9MFlFEcRcDkIDG3aQfISIzsC6E05kk=";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "/usr/local/bin" "$out/bin" \
-      --replace "setcap" "#setcap"
+      --replace-fail "/usr/local/bin" "$out/bin" \
+      --replace-fail "setcap" "#setcap"
   '';
 
   buildInputs = [ libpcap ];
@@ -34,11 +35,9 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = ubridge;
-      command = "ubridge -v";
-    };
+  passthru.tests.version = testers.testVersion {
+    package = ubridge;
+    command = "ubridge -v";
   };
 
   meta = with lib; {
@@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
       various technologies. Currently bridging between UDP tunnels, Ethernet
       and TAP interfaces is supported. Packet capture is also supported.
     '';
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/GNS3/ubridge";
     changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     mainProgram = "ubridge";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66b9c28eeff2..b823f2aa24a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13306,8 +13306,6 @@ with pkgs;
 
   ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
 
-  ubridge = callPackage ../tools/networking/ubridge { };
-
   ubertooth = callPackage ../applications/radio/ubertooth { };
 
   ucarp = callPackage ../servers/ucarp { };

From f04bdba5275f734e02ad988e582483364e48e114 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 20:15:06 +0200
Subject: [PATCH 2/4] ubridge: add passthru.updateScript

---
 pkgs/by-name/ub/ubridge/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix
index d52d32fa881f..1f78513def67 100644
--- a/pkgs/by-name/ub/ubridge/package.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libpcap,
+  nix-update-script,
   testers,
   ubridge,
 }:
@@ -35,9 +36,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = ubridge;
-    command = "ubridge -v";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = ubridge;
+      command = "ubridge -v";
+    };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From bab6df353c7342e18e56dcba14edf53d1789e4c5 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 20:15:48 +0200
Subject: [PATCH 3/4] ubridge: 0.9.18 -> 0.9.19

https://github.com/GNS3/ubridge/compare/v0.9.18...v0.9.19
---
 pkgs/by-name/ub/ubridge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix
index 1f78513def67..5bf91bc968f8 100644
--- a/pkgs/by-name/ub/ubridge/package.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ubridge";
-  version = "0.9.18";
+  version = "0.9.19";
 
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "ubridge";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vo57Yw5E4AdUt9MFlFEcRcDkIDG3aQfISIzsC6E05kk=";
+    hash = "sha256-utzXLPF0VszMZORoik5/0lKhiyKO9heKuNO4KPsPVsI=";
   };
 
   postPatch = ''

From f29ed88f30c7310913ca58294681044b56844bcd Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 22 Sep 2024 20:19:19 +0200
Subject: [PATCH 4/4] ubridge: add anthonyroussel to maintainers

---
 pkgs/by-name/ub/ubridge/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix
index 5bf91bc968f8..c5f467ad6a3b 100644
--- a/pkgs/by-name/ub/ubridge/package.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -55,7 +55,10 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     mainProgram = "ubridge";
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [
+      primeos
+      anthonyroussel
+    ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }