From 38c67b988a18f095d3a283ed7a9f921c77c9daae Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sat, 29 Mar 2025 03:20:21 +0000
Subject: [PATCH 1/2] boatswain: 0.4.0 -> 5.0

Diff: https://gitlab.gnome.org/World/boatswain/-/compare/0.4.0..5.0

Changelog: https://gitlab.gnome.org/World/boatswain/-/releases/5.0
---
 pkgs/by-name/bo/boatswain/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bo/boatswain/package.nix b/pkgs/by-name/bo/boatswain/package.nix
index 4dbdaa3e462c..a200ecdddfc2 100644
--- a/pkgs/by-name/bo/boatswain/package.nix
+++ b/pkgs/by-name/bo/boatswain/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boatswain";
-  version = "0.4.0";
+  version = "5.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "boatswain";
-    rev = version;
-    hash = "sha256-Yqf7NJMyE6mg1zJJCLrIr6Emwt/nvlLHLAEtCXqFT8M=";
+    tag = version;
+    hash = "sha256-XE4MxaV9BXl5EQjumO/6HhRHfAyjjc5BeYFPAa+mdWY=";
   };
 
   nativeBuildInputs = [

From 249670c2251e6525d27bbb93f4802988130ba9dd Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Fri, 28 Mar 2025 23:33:04 -0400
Subject: [PATCH 2/2] boatswain: modernize and clean up deps

---
 pkgs/by-name/bo/boatswain/package.nix | 59 +++++++++++++++------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/bo/boatswain/package.nix b/pkgs/by-name/bo/boatswain/package.nix
index a200ecdddfc2..2296f2cd057d 100644
--- a/pkgs/by-name/bo/boatswain/package.nix
+++ b/pkgs/by-name/bo/boatswain/package.nix
@@ -1,28 +1,28 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  meson,
-  ninja,
-  pkg-config,
-  gtk4,
-  libgee,
-  libadwaita,
-  wrapGAppsHook4,
-  appstream-glib,
+  appstream,
   desktop-file-utils,
-  libpeas,
-  libportal-gtk4,
+  fetchFromGitLab,
+  glib,
+  graphene,
+  gtk4,
   gusb,
   hidapi,
   json-glib,
+  libadwaita,
+  libpeas2,
+  libportal-gtk4,
   libsecret,
   libsoup_3,
-  libpeas2,
+  meson,
+  ninja,
   nix-update-script,
+  pkg-config,
+  wrapGAppsHook4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boatswain";
   version = "5.0";
 
@@ -30,44 +30,49 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "boatswain";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-XE4MxaV9BXl5EQjumO/6HhRHfAyjjc5BeYFPAa+mdWY=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
+    appstream
+    desktop-file-utils
+    glib
+    gtk4
+    json-glib
+    libpeas2
     meson
     ninja
     pkg-config
     wrapGAppsHook4
-    appstream-glib
-    desktop-file-utils
   ];
 
   buildInputs = [
+    graphene
     gtk4
-    libadwaita
-    libgee
-    libpeas
-    libportal-gtk4
     gusb
     hidapi
-    json-glib
+    libadwaita
+    libpeas2
+    libportal-gtk4
     libsecret
     libsoup_3
-    libpeas2
   ];
 
   passthru = {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Control Elgato Stream Deck devices";
     homepage = "https://gitlab.gnome.org/World/boatswain";
+    changelog = "https://gitlab.gnome.org/World/boatswain/-/releases/${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ _0xMRTT ] ++ lib.teams.gnome-circle.members;
     mainProgram = "boatswain";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ _0xMRTT ] ++ lib.teams.gnome-circle.members;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})