cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

python3Packages.ovito: 3.0.0 -> 3.3.1

Browse source
This commit is contained in:
Pavol Rusnak 2020-10-31 18:07:42 +01:00 committed by Jonathan Ringer
parent eaf06c30ac
commit 0d8f43c402
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/development/python-modules/ovito/default.nix
View file

@ -1,23 +1,33 @@
{ stdenv, fetchgit { stdenv
, fetchFromGitLab
, cmake , cmake
, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh , ffmpeg
, pythonPackages , netcdf
, qscintilla
, zlib
, boost
, git
, fftw
, hdf5
, libssh
, qt5
, python
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
# compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 version = "3.3.1";
# This is not the "released" 3.0.0 just a commit
version = "3.0.0";
pname = "ovito"; pname = "ovito";
src = fetchgit { src = fetchFromGitLab {
url = "https://gitlab.com/stuko/ovito"; owner = "stuko";
rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db"; repo = "${pname}";
sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r"; rev = "v${version}";
sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
}; };
buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ]; buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ];
propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -25,10 +35,9 @@ stdenv.mkDerivation {
description = "Scientific visualization and analysis software for atomistic simulation data"; description = "Scientific visualization and analysis software for atomistic simulation data";
homepage = "https://www.ovito.org"; homepage = "https://www.ovito.org";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
# ensures not built on hydra # ensures not built on hydra
# https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
hydraPlatforms = [ ]; hydraPlatforms = [ ];
broken = true; # cmake unable to find Qt5Core and other dependencies
}; };
} }

2
pkgs/top-level/python-packages.nix
View file

@ -4272,7 +4272,7 @@ in {
ovh = callPackage ../development/python-modules/ovh { }; ovh = callPackage ../development/python-modules/ovh { };
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });
owslib = callPackage ../development/python-modules/owslib { }; owslib = callPackage ../development/python-modules/owslib { };