From 41ea8ccd38bbf7c89644e2aa28e0bac32b80f566 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:21:24 +0200
Subject: [PATCH 1/2] bino3d: move to by-name

---
 .../default.nix => by-name/bi/bino3d/package.nix}   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/video/bino3d/default.nix => by-name/bi/bino3d/package.nix} (87%)

diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/by-name/bi/bino3d/package.nix
similarity index 87%
rename from pkgs/applications/video/bino3d/default.nix
rename to pkgs/by-name/bi/bino3d/package.nix
index 733e0869500c..eb8237128034 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/by-name/bi/bino3d/package.nix
@@ -6,10 +6,7 @@
   ninja,
   pkg-config,
   pandoc,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qttools,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     pandoc
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qttools
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qttools
     # The optional QVR dependency is not currently packaged.
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bce7e6e5c84..5dee24d22fe5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10328,8 +10328,6 @@ with pkgs;
 
   bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
 
-  bino3d = qt6Packages.callPackage ../applications/video/bino3d { };
-
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
   bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
 

From d38c9968972117f632d1c43ffd0edad8c4f67775 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:57:39 +0200
Subject: [PATCH 2/2] bino3d: 2.5 -> 2.6, fix build

---
 pkgs/by-name/bi/bino3d/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bi/bino3d/package.nix b/pkgs/by-name/bi/bino3d/package.nix
index eb8237128034..964e355924ba 100644
--- a/pkgs/by-name/bi/bino3d/package.nix
+++ b/pkgs/by-name/bi/bino3d/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   cmake,
   ninja,
   pkg-config,
@@ -10,13 +10,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "bino";
-  version = "2.5";
+  pname = "bino3d";
+  version = "2.6";
 
-  src = fetchgit {
-    url = "https://git.marlam.de/git/bino.git";
-    rev = "bino-${finalAttrs.version}";
-    hash = "sha256-vGPbSYTfRy414xVcLIvOnN4Te36HWVz7DQegNhYb3u4=";
+  src = fetchFromGitHub {
+    owner = "marlam";
+    repo = "bino";
+    tag = "bino-${finalAttrs.version}";
+    hash = "sha256-izgiAmMou/EW5KOzC8HuPaH4uVFLajoDhVwkJkzXdP0=";
   };
 
   nativeBuildInputs = [