Merge pull request #194031 from NickCao/stellarium

5 files changed, 112 insertions, 9 deletions

diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix
new file mode 100644
index 0000000000000..528fc74394f8f
--- /dev/null
+++ b/pkgs/applications/science/astronomy/calcmysky/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, wrapQtAppsHook
+, glm
+, eigen
+, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  pname = "calcmysky";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "10110111";
+    repo = "CalcMySky";
+    rev = "v${version}";
+    hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48=";
+  };
+
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  buildInputs = [ glm eigen qtbase ];
+
+  doCheck = true;
+
+  meta = with lib;{
+    description = "Simulator of light scattering by planetary atmospheres";
+    homepage = "https://github.com/10110111/CalcMySky";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index b157be0fcb75c..cabb281551d76 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,25 +1,51 @@
-{ stdenv, lib, fetchFromGitHub
-, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv
-, qtscript, qtserialport, qttools, qtcharts
-, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, perl
+, wrapQtAppsHook
+, qtbase
+, qtcharts
+, qtlocation
+, qtmultimedia
+, qtscript
+, qtserialport
+, qtwebengine
+, calcmysky
+, qxlsx
+, indilib
+, libnova
 }:
 
 stdenv.mkDerivation rec {
   pname = "stellarium";
-  version = "0.22.2";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${version}";
-    sha256 = "sha256-FBH5IB1keMzRP06DQK2e7HX8rwm5/sdTX+cB80uG0vw=";
+    sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE=";
   };
 
-  nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    perl
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
-    freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools
-    qtmultimedia qtlocation qtbase qtcharts
+    qtbase
+    qtcharts
+    qtlocation
+    qtmultimedia
+    qtscript
+    qtserialport
+    qtwebengine
+    calcmysky
+    qxlsx
+    indilib
+    libnova
   ];
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix
new file mode 100644
index 0000000000000..b077b77517b8b
--- /dev/null
+++ b/pkgs/development/libraries/qxlsx/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qxlsx";
+  version = "1.4.4";
+
+  src = fetchFromGitHub {
+    owner = "QtExcel";
+    repo = "QXlsx";
+    rev = "v${version}";
+    hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase ];
+
+  # Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d
+  postPatch = ''
+    substituteInPlace QXlsx/CMakeLists.txt \
+     --replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE'
+  '';
+
+  preConfigure = ''
+    cd QXlsx
+  '';
+
+  dontWrapQtApps = true;
+
+  meta = with lib;{
+    description = "Excel file(*.xlsx) reader/writer library using Qt 5 or 6";
+    homepage = "https://qtexcel.github.io/QXlsx";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d16e8e8fd14c7..aaad0d8ce3a5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27511,6 +27511,8 @@ with pkgs;
       inherit (gnome2) libglade;
   };
 
+  calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { };
+
   calcurse = callPackage ../applications/misc/calcurse { };
 
   calculix = callPackage ../applications/science/math/calculix {};
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 8f749dda9812a..116ad216e025a 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -220,6 +220,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { };
 
+  qxlsx = callPackage ../development/libraries/qxlsx { };
+
   soqt = callPackage ../development/libraries/soqt { };
 
   telepathy = callPackage ../development/libraries/telepathy/qt { };