diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix index c5dddd68fcf1..5e5847dce033 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix @@ -1,23 +1,33 @@ -{ stdenv, fetchgit +{ stdenv +, fetchFromGitLab , cmake -, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh -, pythonPackages +, ffmpeg +, netcdf +, qscintilla +, zlib +, boost +, git +, fftw +, hdf5 +, libssh +, qt5 +, python }: -stdenv.mkDerivation { - # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 - # This is not the "released" 3.0.0 just a commit - version = "3.0.0"; +stdenv.mkDerivation rec { + version = "3.3.1"; pname = "ovito"; - src = fetchgit { - url = "https://gitlab.com/stuko/ovito"; - rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db"; - sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r"; + src = fetchFromGitLab { + owner = "stuko"; + repo = pname; + rev = "v${version}"; + sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h"; }; - buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ]; - propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ]; + buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ]; + + propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ]; enableParallelBuilding = true; @@ -25,10 +35,9 @@ stdenv.mkDerivation { description = "Scientific visualization and analysis software for atomistic simulation data"; homepage = "https://www.ovito.org"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; # ensures not built on hydra # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 hydraPlatforms = [ ]; - broken = true; # cmake unable to find Qt5Core and other dependencies }; } |