From a398cf223f1a5feb7e994669faf933f44df15cd1 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton1192@gmail.com>
Date: Fri, 26 Jan 2024 11:13:07 -0500
Subject: [PATCH] Delayed update...

---
 pkgs/all-packages.nix |  2 +-
 pkgs/lumpy.nix        |  6 +++++
 pkgs/ovito.nix        | 55 +++++++++++++++++++++++++++++++------------
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index 71ae4d1..4552bdf 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -25,7 +25,7 @@ final: prev: with prev; {
 
   openslide = callPackage ./openslide { };
 
-  ovito = libsForQt5.callPackage ./ovito.nix { };
+  ovito = qt6Packages.callPackage ./ovito.nix { };
 
   pythonOverrides = lib.composeExtensions prev.pythonOverrides (import ./python-packages.nix pkgs);
 
diff --git a/pkgs/lumpy.nix b/pkgs/lumpy.nix
index cf2eb3d..e0f0f28 100644
--- a/pkgs/lumpy.nix
+++ b/pkgs/lumpy.nix
@@ -12,6 +12,12 @@
           extension = "zip";
           sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff";
         };
+        nativeCheckInputs = [
+          prev.pytest
+          # "hypothesis" indirectly depends on numpy to build its documentation.
+          prev.hypothesis
+          prev.typing-extensions
+        ];
       });
     };
   };
diff --git a/pkgs/ovito.nix b/pkgs/ovito.nix
index 2f8dfc3..2096505 100644
--- a/pkgs/ovito.nix
+++ b/pkgs/ovito.nix
@@ -1,30 +1,55 @@
-{ mkDerivation, lib, fetchFromGitLab, cmake
-, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python38
-, qtbase, qtsvg, qttools, qscintilla }:
+{ stdenv
+, lib
+, fetchFromGitLab
+, cmake
+, ninja
+, wrapQtAppsHook
+, qtbase
+, qtnetworkauth
+, qtscxml
+, qtsvg
+, ffmpeg
+, netcdf
+, libssh
+, boost
+, hdf5
+, python3 ? python3
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ovito";
-  version = "3.4.0";
+  version = "3.8.4";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
     rev = "v${version}";
-    sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5";
+    sha256 = "Vw9mB+huQHLg8OqyGo9KEg55ag3NQG+nTJj3tB++eQk=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     cmake
-    boost
-    netcdf hdf5
-    fftwSinglePrec
-    muparser
-    openssl
-    ffmpeg
-    python38
-    qtbase qtsvg qttools qscintilla
+    ninja
+    wrapQtAppsHook
   ];
 
+  buildInputs = [
+    qtbase
+    qtnetworkauth
+    qtscxml
+    qtsvg
+    ffmpeg
+    netcdf
+    libssh
+    boost
+    hdf5
+    python3
+  ];
+
+  cmakeFlags = [
+    "-DOVITO_BUILD_PYPI=${if python3 != null then "ON" else "OFF"}"
+  ];
+  
   meta = with lib; {
     description = "Scientific visualization and analysis software for atomistic and particle simulation data";
     homepage = https://ovito.org;