nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 15:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2020-12-31 18:42:41 +00:00
committed by GitHub
parent bf46afde6b 487141bc93
commit 5dffe03f30
25 changed files with 513 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/ovito/default.nix
View File

@@ -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

4
pkgs/development/python-modules/smart_open/default.nix
View File

@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "smart_open";
version = "4.0.1";
version = "4.1.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "49396d86de8e0d609ec40422c59f837dd944dcdf727feed6f2ff8cbdc0e3bc8e";
sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build