public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62374 from gebner/cura410

Browse Source 
cura: 4.0.0 -> 4.1.0
This commit is contained in:
Nikolay Amiantov
2019-06-01 13:57:46 +03:00
committed by GitHub
parent 278a7f9f20 b3a60dc3c1
commit e07dba7572
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/libarcus/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
{ stdenv, buildPythonPackage, python, fetchFromGitHub
, cmake, sip, protobuf, pythonOlder }:
buildPythonPackage rec {
pname = "libarcus";
version = "4.0.0";
version = "4.1.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
sha256 = "14c62bsc2cynhaajpdidcqpq2vqwshrdkqyzwvpsjjbfmlx3b1ay";
sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4";
};
disabled = pythonOlder "3.4.0";
@@ -20,8 +20,7 @@ buildPythonPackage rec {
buildInputs = [ protobuf ];
postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
'';
meta = with stdenv.lib; {

9
pkgs/development/python-modules/libsavitar/default.nix
View File

@@ -1,20 +1,19 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }:
{ stdenv, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip }:
buildPythonPackage rec {
pname = "libsavitar";
version = "4.0.0";
version = "4.1.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
sha256 = "1q70l37qafzfkpw8vlagmpd2w576b6jc1xmxp3wf3qfq45j8kya0";
sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf";
};
postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
'';
nativeBuildInputs = [ cmake ];

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

@@ -2,7 +2,7 @@
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "4.0.0";
version = "4.1.0";
pname = "uranium";
format = "other";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
sha256 = "1dzn064np76q0xpypcwsa7k7arzihg79xw1pgcvdizk9kzc6rw3y";
sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj";
};
disabled = pythonOlder "3.5.0";