Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eaf06c30ace7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d8f43c40236
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 1, 2020

  1. python3Packages.ovito: 3.0.0 -> 3.3.1

    @prusnak
    prusnak authored and Jonathan Ringer committed Nov 1, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    0d8f43c View commit details
Showing with 25 additions and 16 deletions.
  1. +24 −15 pkgs/development/python-modules/ovito/default.nix
  2. +1 −1 pkgs/top-level/python-packages.nix
39 changes: 24 additions & 15 deletions pkgs/development/python-modules/ovito/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
{ 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;

meta = with stdenv.lib; {
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
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4272,7 +4272,7 @@ in {

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 { };