From 21565d79a376d28fce99d21a69eadb1c49af4996 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 1 Jun 2019 11:18:58 +0200 Subject: [PATCH 1/5] pythonPackages.libsavitar: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/libsavitar/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index dc783ba8f33..f0fbcf5f311 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -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 ]; From bb9cb2311ce3ca5fdd4fcb93e4a88d7a8209a316 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 1 Jun 2019 11:19:16 +0200 Subject: [PATCH 2/5] pythonPackages.libarcus: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/libarcus/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 67194966949..add1957dd6d 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -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; { From 2d88612f97bd81d316bf055238491e806d662844 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 1 Jun 2019 11:19:39 +0200 Subject: [PATCH 3/5] curaengine: 4.0.0 -> 4.1.0 --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 9188e461e51..25cfccd3ed3 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0p4zcckrlrpyp5xdqgvp0phmawyh4cy8vipim9fvgsfcin4vhrv7"; + sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8"; }; nativeBuildInputs = [ cmake ]; From 6f46f1b615a9b9ee6ecc5e5668f4e253031085c2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 1 Jun 2019 11:19:55 +0200 Subject: [PATCH 4/5] pythonPackages.uranium: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index b4081870fbe..6365846bd26 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -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"; From b3a60dc3c1e250ac27b4443cd2c86f6da706bdc5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 1 Jun 2019 11:20:09 +0200 Subject: [PATCH 5/5] cura: 4.0.0 -> 4.1.0 --- pkgs/applications/misc/cura/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index d570a2570d1..958b0d4844b 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { name = "cura-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf"; + sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; + sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; @@ -27,12 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-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 = ''