From 4387389a28b22e7bb42fc8c657d59f523c7e1211 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Feb 2026 17:09:18 -0600
Subject: [PATCH 1/2] xygrib: migrate to by-name

---
 .../default.nix => by-name/xy/xygrib/package.nix}      | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/xygrib/default.nix => by-name/xy/xygrib/package.nix} (96%)

diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/by-name/xy/xygrib/package.nix
similarity index 96%
rename from pkgs/applications/misc/xygrib/default.nix
rename to pkgs/by-name/xy/xygrib/package.nix
index 67d3e165702b..ecac076e3eed 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/by-name/xy/xygrib/package.nix
@@ -2,15 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wrapQtAppsHook,
   cmake,
   bzip2,
-  qtbase,
-  qttools,
   libnova,
   proj,
   libpng,
   openjpeg,
+  qt5,
 }:
 
 stdenv.mkDerivation {
@@ -26,12 +24,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt5.qttools
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     bzip2
-    qtbase
+    qt5.qtbase
     libnova
     proj
     openjpeg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a8219a1fea..d9fdcc473d32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10969,8 +10969,6 @@ with pkgs;
     xppen_4
     ;
 
-  xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
-
   ydiff = with python3.pkgs; toPythonApplication ydiff;
 
   yokadi = python3Packages.callPackage ../applications/misc/yokadi { };

From efaacd513cf2d95e8c968bceeb4e4a29b59bfd99 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 10 Feb 2026 17:10:17 -0600
Subject: [PATCH 2/2] xygrib: switch from rev to hash

---
 pkgs/by-name/xy/xygrib/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xy/xygrib/package.nix b/pkgs/by-name/xy/xygrib/package.nix
index ecac076e3eed..0d75836e8cb0 100644
--- a/pkgs/by-name/xy/xygrib/package.nix
+++ b/pkgs/by-name/xy/xygrib/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     owner = "opengribs";
     repo = "XyGrib";
     rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310";
-    sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
+    hash = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
   };
 
   nativeBuildInputs = [