From cf166c43d9e6ef512b8c23f783c68348682d7099 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 7 Nov 2024 19:03:50 +0000
Subject: [PATCH 1/2] binary: 5.0 -> 5.1

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

diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 0f77b26c5c86..311393c9049b 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
-  version = "5.0";
+  version = "5.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
     rev = "refs/tags/${version}";
-    hash = "sha256-T/gFXYcUJBN1NWMQaFco1bqqZTz3JHQpM8C2Y5yz7SI=";
+    hash = "sha256-HBmWaT0cjYz3UAO1r5chFW7KARpL1EnY8wEeR9etPE0=";
   };
 
   nativeBuildInputs = [

From 9c8c11f5c2d1dc232f26335c3e5a98805ce7458b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 7 Nov 2024 14:28:58 -0500
Subject: [PATCH 2/2] binary: run meson checks

also clean up a few things
---
 pkgs/by-name/bi/binary/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 311393c9049b..2838820a4618 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -1,23 +1,24 @@
 {
   lib,
-  fetchFromGitHub,
-  python3Packages,
   appstream,
   blueprint-compiler,
   desktop-file-utils,
+  fetchFromGitHub,
   glib,
   gobject-introspection,
+  gtk4,
   libadwaita,
   meson,
   ninja,
   pkg-config,
+  python3Packages,
   wrapGAppsHook4,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
   version = "5.1";
-  format = "other";
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
@@ -26,12 +27,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-HBmWaT0cjYz3UAO1r5chFW7KARpL1EnY8wEeR9etPE0=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     appstream
     blueprint-compiler
-    desktop-file-utils
-    glib # need glib-compile-schemas
+    desktop-file-utils # for `desktop-file-validate`
+    glib # for `glib-compile-schemas`
     gobject-introspection
+    gtk4 # for `gtk-update-icon-cache`
     meson
     ninja
     pkg-config
@@ -45,6 +49,13 @@ python3Packages.buildPythonApplication rec {
   dontWrapGApps = true;
   makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
+  # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
+  # is skipped by `buildPythonApplication`
+  # https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296
+  postInstallCheck = ''
+    mesonCheckPhase
+  '';
+
   meta = {
     description = "Small and simple app to convert numbers to a different base";
     homepage = "https://github.com/fizzyizzy05/binary";