From b9f1e3cdfdb5f31d7a738d01cbedcf4f11f724be Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 08:59:19 +0200 Subject: [PATCH 1/8] pythonPackages.libarcus: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/libarcus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index add1957dd6d..e3ae5626e2c 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4"; + sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44"; }; disabled = pythonOlder "3.4.0"; @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ]; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with stdenv.lib; { From c0df1d0b42a52258ae75e0795443d7ec22b72809 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 08:59:42 +0200 Subject: [PATCH 2/8] pythonPackages.libsavitar: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/libsavitar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index f0fbcf5f311..93490d6f449 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf"; + sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1"; }; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; nativeBuildInputs = [ cmake ]; From a6ef0a71886de1c419091c750a35a26600fa5638 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:00:05 +0200 Subject: [PATCH 3/8] pythonPackages.uranium: 4.1.0 -> 4.2.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 6365846bd26..c245ac0b565 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.1.0"; + version = "4.2.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj"; + sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9"; }; disabled = pythonOlder "3.5.0"; From 6bd380cb030ede872ed2da4c90966a615d23771d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:00:32 +0200 Subject: [PATCH 4/8] curaengine: 4.1.0 -> 4.2.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 a7339acddee..ae433ebf52e 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.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8"; + sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd"; }; nativeBuildInputs = [ cmake ]; From 041e8a9739cb83fe8cb014076a7a0d2165606740 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:00:41 +0200 Subject: [PATCH 5/8] cura: 4.1.0 -> 4.2.1 --- pkgs/applications/misc/cura/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 290801ea578..e9366d43ef4 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,21 +1,21 @@ { mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { - name = "cura-${version}"; - version = "4.1.0"; + pname = "cura"; + version = "4.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz"; + sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = version; - sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl"; + rev = "4.2.0"; # TODO: change back to `version` after 4.2.1 + sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; From 76f01413bd04fe7ada2045cbb27c21b01c2116bc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:01:10 +0200 Subject: [PATCH 6/8] cura: workaround for #59901 --- pkgs/applications/misc/cura/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index e9366d43ef4..67e3924ca18 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -29,6 +29,11 @@ mkDerivation rec { "-DCURA_VERSION=${version}" ]; + makeWrapperArgs = [ + # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901 + "--set OMP_NUM_THREADS 1" + ]; + postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py From 7246d5cfe60b561dd83c43388881798f043c2ddd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:01:29 +0200 Subject: [PATCH 7/8] curaPlugins.octoprint: 3.5.5 -> 3.5.8 --- pkgs/applications/misc/cura/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index a5a196a7810..bdbf8f24136 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -6,13 +6,13 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.5"; + version = "3.5.8"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a"; - sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x"; + rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738"; + sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0"; }; nativeBuildInputs = [ cmake ]; From 9e0e36b9d9b84ad97d0dc19e3adf4bc93068ce7b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Aug 2019 09:09:25 +0200 Subject: [PATCH 8/8] cura: add myself as maintainer --- pkgs/applications/misc/cura/default.nix | 2 +- pkgs/applications/misc/curaengine/default.nix | 2 +- pkgs/development/python-modules/libarcus/default.nix | 2 +- pkgs/development/python-modules/libsavitar/default.nix | 2 +- pkgs/development/python-modules/uranium/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 67e3924ca18..c211879c3e2 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -57,6 +57,6 @@ mkDerivation rec { homepage = https://github.com/Ultimaker/Cura; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ae433ebf52e..823e6d6e2e9 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index e3ae5626e2c..54d9193c25b 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libArcus; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 93490d6f449..657df2dfb7c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar orivej ]; + maintainers = with maintainers; [ abbradar orivej gebner ]; }; } diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index c245ac0b565..aec0f731554 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/Uranium; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; }