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

Merge pull request #58957 from gebner/cura4 

cura: 3.6.0 -> 4.0.0
This commit is contained in:
Gabriel Ebner 2019-04-05 13:42:17 +02:00 committed by GitHub
parent d656b73371 66c8e4bc7a
commit fb16ffd8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/cura/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }: { mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine }:
mkDerivation rec { mkDerivation rec {
name = "cura-${version}"; name = "cura-${version}";
version = "3.6.0"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Cura"; repo = "Cura";
rev = version; rev = version;
sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90"; sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf";
}; };
materials = fetchFromGitHub { materials = fetchFromGitHub {
@ -18,7 +18,7 @@ mkDerivation rec {
sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12";
}; };
buildInputs = [ qtbase qtquickcontrols2 ]; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
libsavitar numpy-stl pyserial requests uranium zeroconf libsavitar numpy-stl pyserial requests uranium zeroconf
]; ];
@ -27,6 +27,12 @@ mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-DURANIUM_DIR=${python3.pkgs.uranium.src}"
"-DCURA_VERSION=${version}" "-DCURA_VERSION=${version}"
# see https://github.com/Ultimaker/Cura/issues/5142
"-DCURA_SDK_VERSION=6.0.0"
# remove after 4.0.0, see https://github.com/void-linux/void-packages/pull/9880#issuecomment-475453025
"-DCURA_CLOUD_API_VERSION=1"
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/misc/curaengine/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curaengine-${version}"; name = "curaengine-${version}";
version = "3.6.0"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "CuraEngine"; repo = "CuraEngine";
rev = version; rev = version;
sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm"; sha256 = "0p4zcckrlrpyp5xdqgvp0phmawyh4cy8vipim9fvgsfcin4vhrv7";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libarcus"; pname = "libarcus";
version = "3.6.0"; version = "4.0.0";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "libArcus"; repo = "libArcus";
rev = version; rev = version;
sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43"; sha256 = "14c62bsc2cynhaajpdidcqpq2vqwshrdkqyzwvpsjjbfmlx3b1ay";
}; };
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

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

@ -2,14 +2,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libsavitar"; pname = "libsavitar";
version = "3.6.0"; version = "4.0.0";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "libSavitar"; repo = "libSavitar";
rev = version; rev = version;
sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv"; sha256 = "1q70l37qafzfkpw8vlagmpd2w576b6jc1xmxp3wf3qfq45j8kya0";
}; };
postPatch = '' postPatch = ''

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

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