about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-12-31 17:40:38 +0100
committerGitHub <noreply@github.com>2020-12-31 17:40:38 +0100
commitd9020a98eb5c06fff005bc3b63cf934f285c2272 (patch)
tree602747f7c0a196435369098b1a825e69f7fd90d1
parentc23468489ceb07e1158bf9f6a0fa42e75f87ddd9 (diff)
parent159bb124ec485a3c2186d26ca0d5fb693540b669 (diff)
downloadnixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar.gz
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar.bz2
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar.lz
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar.xz
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.tar.zst
nixlib-d9020a98eb5c06fff005bc3b63cf934f285c2272.zip
Merge pull request #108056 from SuperSandro2000/ovito-update
ovito: 3.3.1 -> 3.3.5
-rw-r--r--pkgs/development/python-modules/ovito/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 5e5847dce033..d813d2ac47f3 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -15,26 +15,25 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.1";
+  version = "3.3.5";
   pname = "ovito";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
+    sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ=";
   };
 
-  buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
+  nativeBuildInputs = [ cmake git ];
+  buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
 
   propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Scientific visualization and analysis software for atomistic simulation data";
     homepage = "https://www.ovito.org";
-    license = licenses.gpl3;
+    license = with licenses; [ gpl3Only mit ];
     maintainers = with maintainers; [ costrouc ];
     # ensures not built on hydra
     # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048