Merge pull request #87516 from gebner/cura461

This commit is contained in:
Gabriel Ebner
2020-05-11 13:06:16 +02:00
committed by GitHub
7 changed files with 44 additions and 14 deletions

View File

@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "libarcus";
version = "4.5.0";
version = "4.6.1";
format = "other";
src = fetchFromGitHub {

View File

@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "libsavitar";
version = "4.5.0";
version = "4.6.1";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
sha256 = "1l3l8cgaxzqdk93880p2ijrabshdj5sq05cwj1i6jpmhlqc5b9rx";
sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq";
};
postPatch = ''

View File

@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, numpy }:
buildPythonPackage rec {
pname = "trimesh";
version = "3.6.36";
src = fetchPypi {
inherit pname version;
sha256 = "1m8dqqyzazrjk4d32cqn4d8gvbfcwgs2qbmgvpi2f2mi5vnp6d85";
};
propagatedBuildInputs = [ numpy ];
# tests are not included in pypi distributions and would require lots of
# optional dependencies
doCheck = false;
meta = with lib; {
description = "Python library for loading and using triangular meshes.";
homepage = "https://trimsh.org/";
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
};
}

View File

@@ -2,7 +2,7 @@
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "4.5.0";
version = "4.6.1";
pname = "uranium";
format = "other";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
sha256 = "1l8fwj521irla42bdbw298d3c5rjpn1nm9xhjnx7hidbqixr5d27";
sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r";
};
disabled = pythonOlder "3.5.0";