From 1778c8ed15d1cf21df8dbfd76a1816b1d68e4da1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:23:31 +0200
Subject: [PATCH] calcmysky: move to by-name

---
 .../ca/calcmysky/package.nix}                       | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{applications/science/astronomy/calcmysky/default.nix => by-name/ca/calcmysky/package.nix} (85%)

diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/by-name/ca/calcmysky/package.nix
similarity index 85%
rename from pkgs/applications/science/astronomy/calcmysky/default.nix
rename to pkgs/by-name/ca/calcmysky/package.nix
index 5c961c99a85c..aa0f2562fcf8 100644
--- a/pkgs/applications/science/astronomy/calcmysky/default.nix
+++ b/pkgs/by-name/ca/calcmysky/package.nix
@@ -3,32 +3,31 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
+  qt6,
   glm,
   eigen,
-  qtbase,
   stellarium,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "calcmysky";
   version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "10110111";
     repo = "CalcMySky";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     glm
     eigen
-    qtbase
+    qt6.qtbase
   ];
 
   cmakeFlags = [ "-DQT_VERSION=6" ];
@@ -45,4 +44,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nickcao ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd3a52b07801..2b39b1e084db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9915,8 +9915,6 @@ with pkgs;
 
   breezy = with python3Packages; toPythonApplication breezy;
 
-  calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
-
   # calico-felix and calico-node have not been packaged due to libbpf, linking issues
   inherit (callPackage ../applications/networking/cluster/calico { })
     calico-apiserver