From c93e44748e4de384a39c6811f176808eadb6d423 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 20 Oct 2024 16:44:34 +0200
Subject: [PATCH 1/5] birdwatcher: adopt by stv0g

---
 pkgs/servers/birdwatcher/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix
index cca210e4a1bc..82c565317dd3 100644
--- a/pkgs/servers/birdwatcher/default.nix
+++ b/pkgs/servers/birdwatcher/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
     description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon";
     changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with maintainers; [ stv0g ];
     mainProgram = "birdwatcher";
   };
 }

From 663deaba005111a3c4a5f4ec21b4a15d1cbcbbfb Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 20 Oct 2024 16:44:59 +0200
Subject: [PATCH 2/5] birdwatcher: reformat according to RFC166

---
 pkgs/servers/birdwatcher/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix
index 82c565317dd3..b15c49686239 100644
--- a/pkgs/servers/birdwatcher/default.nix
+++ b/pkgs/servers/birdwatcher/default.nix
@@ -1,7 +1,8 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, nixosTests
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nixosTests,
 }:
 
 buildGoModule rec {

From fe4ca0386582e3bdb5762ef28108c1d29bc9f699 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 20 Oct 2024 16:45:36 +0200
Subject: [PATCH 3/5] birdwatcher: avoid 'with lib' usage

---
 pkgs/servers/birdwatcher/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix
index b15c49686239..3afde5683c3a 100644
--- a/pkgs/servers/birdwatcher/default.nix
+++ b/pkgs/servers/birdwatcher/default.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     inherit (nixosTests) birdwatcher;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/alice-lg/birdwatcher";
     description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon";
     changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ stv0g ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ stv0g ];
     mainProgram = "birdwatcher";
   };
 }

From 694efe2c615641cebe73506d0d0ebab0a8340236 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 20 Oct 2024 16:47:45 +0200
Subject: [PATCH 4/5] birdwatcher: migrate to by-name

---
 .../default.nix => by-name/bi/birdwatcher/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/birdwatcher/default.nix => by-name/bi/birdwatcher/package.nix} (100%)

diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/by-name/bi/birdwatcher/package.nix
similarity index 100%
rename from pkgs/servers/birdwatcher/default.nix
rename to pkgs/by-name/bi/birdwatcher/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bda58a57c3ec..243ff42aa683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24096,8 +24096,6 @@ with pkgs;
 
   bird-lg = callPackage ../servers/bird-lg { };
 
-  birdwatcher = callPackage ../servers/birdwatcher { };
-
   bloat = callPackage ../servers/bloat { };
 
   bosun = callPackage ../servers/monitoring/bosun { };

From e69a5a04b80b7d342c6900129c0900a97fbf98e9 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 27 Oct 2024 10:31:38 +0100
Subject: [PATCH 5/5] birdwatcher: add updateScript

---
 pkgs/by-name/bi/birdwatcher/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/birdwatcher/package.nix b/pkgs/by-name/bi/birdwatcher/package.nix
index 3afde5683c3a..9e2d04f2f7e1 100644
--- a/pkgs/by-name/bi/birdwatcher/package.nix
+++ b/pkgs/by-name/bi/birdwatcher/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildGoModule,
   nixosTests,
+  gitUpdater,
 }:
 
 buildGoModule rec {
@@ -20,8 +21,12 @@ buildGoModule rec {
 
   deleteVendor = true;
 
-  passthru.tests = {
-    inherit (nixosTests) birdwatcher;
+  passthru = {
+    tests = {
+      inherit (nixosTests) birdwatcher;
+    };
+
+    updateScript = gitUpdater { };
   };
 
   meta = {