From dc02c820cf4e705176d5d1aefa75bd6dc6438a34 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:18 +0000
Subject: [PATCH] yacas: migrate to pkgs/by-name

---
 .../ya}/yacas/jsoncpp-fix-include.patch                |  0
 .../yacas/default.nix => by-name/ya/yacas/package.nix} | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/math => by-name/ya}/yacas/jsoncpp-fix-include.patch (100%)
 rename pkgs/{applications/science/math/yacas/default.nix => by-name/ya/yacas/package.nix} (95%)

diff --git a/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch b/pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
similarity index 100%
rename from pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch
rename to pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/by-name/ya/yacas/package.nix
similarity index 95%
rename from pkgs/applications/science/math/yacas/default.nix
rename to pkgs/by-name/ya/yacas/package.nix
index d028f3fc93df..40a0784299a7 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -6,9 +6,6 @@
   cmake,
   perl,
   enableGui ? false,
-  qtbase,
-  wrapQtAppsHook,
-  qtwebengine,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -17,6 +14,7 @@
   enableJava ? false,
   openjdk,
   gtest,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,9 +67,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
   ]
   ++ lib.optionals enableGui [
-    qtbase
-    wrapQtAppsHook
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtwebengine
   ]
   ++ lib.optionals enableJupyter [
     boost
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ff2d7f44708..7c8399ed26be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14001,8 +14001,6 @@ with pkgs;
     };
   };
 
-  yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
-
   yacas-gui = yacas.override {
     enableGui = true;
     enableJupyter = false;