Delayed update...

This commit is contained in:
2024-01-26 11:13:07 -05:00
parent 26d6f99ce4
commit a398cf223f
3 changed files with 47 additions and 16 deletions

View File

@@ -25,7 +25,7 @@ final: prev: with prev; {
openslide = callPackage ./openslide { }; openslide = callPackage ./openslide { };
ovito = libsForQt5.callPackage ./ovito.nix { }; ovito = qt6Packages.callPackage ./ovito.nix { };
pythonOverrides = lib.composeExtensions prev.pythonOverrides (import ./python-packages.nix pkgs); pythonOverrides = lib.composeExtensions prev.pythonOverrides (import ./python-packages.nix pkgs);

View File

@@ -12,6 +12,12 @@
extension = "zip"; extension = "zip";
sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff";
}; };
nativeCheckInputs = [
prev.pytest
# "hypothesis" indirectly depends on numpy to build its documentation.
prev.hypothesis
prev.typing-extensions
];
}); });
}; };
}; };

View File

@@ -1,30 +1,55 @@
{ mkDerivation, lib, fetchFromGitLab, cmake { stdenv
, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python38 , lib
, qtbase, qtsvg, qttools, qscintilla }: , fetchFromGitLab
, cmake
, ninja
, wrapQtAppsHook
, qtbase
, qtnetworkauth
, qtscxml
, qtsvg
, ffmpeg
, netcdf
, libssh
, boost
, hdf5
, python3 ? python3
}:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "ovito"; pname = "ovito";
version = "3.4.0"; version = "3.8.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "stuko"; owner = "stuko";
repo = "ovito"; repo = "ovito";
rev = "v${version}"; rev = "v${version}";
sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5"; sha256 = "Vw9mB+huQHLg8OqyGo9KEg55ag3NQG+nTJj3tB++eQk=";
}; };
buildInputs = [ nativeBuildInputs = [
cmake cmake
boost ninja
netcdf hdf5 wrapQtAppsHook
fftwSinglePrec
muparser
openssl
ffmpeg
python38
qtbase qtsvg qttools qscintilla
]; ];
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; { meta = with lib; {
description = "Scientific visualization and analysis software for atomistic and particle simulation data"; description = "Scientific visualization and analysis software for atomistic and particle simulation data";
homepage = https://ovito.org; homepage = https://ovito.org;