git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66315 from gebner/cura421

cura: 4.1.0 -> 4.2.1

commit8febac00c377abab92dc81771f97c31ea14d0bb7 authorGabriel Ebner <gebner@gebner.org> dateThu 8 Aug 2019, 10:02 (7 years ago) parentf6c363f9e0e36b
6 files changed+28−23
pkgs/applications/misc/cura/default.nix+11−6 pkgs/applications/misc/cura/plugins.nix+3−3 pkgs/applications/misc/curaengine/default.nix+3−3 pkgs/development/python-modules/libarcus/default.nix+4−4 pkgs/development/python-modules/libsavitar/default.nix+4−4 pkgs/development/python-modules/uranium/default.nix+3−3
pkgs/applications/misc/cura/default.nix+11−6
@@ -1,21 +1,21 @@
11{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }:
22
33mkDerivation rec {
4− name = "cura-${version}";
5− version = "4.1.0";
4+ pname = "cura";
5+ version = "4.2.1";
66
77 src = fetchFromGitHub {
88 owner = "Ultimaker";
99 repo = "Cura";
1010 rev = version;
11− sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz";
11+ sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86";
1212 };
1313
1414 materials = fetchFromGitHub {
1515 owner = "Ultimaker";
1616 repo = "fdm_materials";
17− rev = version;
18− sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl";
17+ rev = "4.2.0"; # TODO: change back to `version` after 4.2.1
18+ sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m";
1919 };
2020
2121 buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
@@ -29,6 +29,11 @@ mkDerivation rec {
2929 "-DCURA_VERSION=${version}"
3030 ];
3131
32+ makeWrapperArgs = [
33+ # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
34+ "--set OMP_NUM_THREADS 1"
35+ ];
36+
3237 postPatch = ''
3338 sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
3439 sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -52,6 +57,6 @@ mkDerivation rec {
5257 homepage = https://github.com/Ultimaker/Cura;
5358 license = licenses.lgpl3Plus;
5459 platforms = platforms.linux;
55− maintainers = with maintainers; [ abbradar ];
60+ maintainers = with maintainers; [ abbradar gebner ];
5661 };
5762}
pkgs/applications/misc/cura/plugins.nix+3−3
@@ -6,13 +6,13 @@ let
66
77 octoprint = stdenv.mkDerivation rec {
88 pname = "Cura-OctoPrintPlugin";
9− version = "3.5.5";
9+ version = "3.5.8";
1010
1111 src = fetchFromGitHub {
1212 owner = "fieldOfView";
1313 repo = pname;
14− rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a";
15− sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x";
14+ rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738";
15+ sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0";
1616 };
1717
1818 nativeBuildInputs = [ cmake ];
pkgs/applications/misc/curaengine/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "curaengine-${version}";
5− version = "4.1.0";
5+ version = "4.2.0";
66
77 src = fetchFromGitHub {
88 owner = "Ultimaker";
99 repo = "CuraEngine";
1010 rev = version;
11− sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8";
11+ sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 homepage = https://github.com/Ultimaker/CuraEngine;
2222 license = licenses.agpl3;
2323 platforms = platforms.linux;
24− maintainers = with maintainers; [ abbradar ];
24+ maintainers = with maintainers; [ abbradar gebner ];
2525 };
2626}
pkgs/development/python-modules/libarcus/default.nix+4−4
@@ -3,14 +3,14 @@
33
44buildPythonPackage rec {
55 pname = "libarcus";
6− version = "4.1.0";
6+ version = "4.2.0";
77 format = "other";
88
99 src = fetchFromGitHub {
1010 owner = "Ultimaker";
1111 repo = "libArcus";
1212 rev = version;
13− sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4";
13+ sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44";
1414 };
1515
1616 disabled = pythonOlder "3.4.0";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
2020 buildInputs = [ protobuf ];
2121
2222 postPatch = ''
23− sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
23+ sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
2424 '';
2525
2626 meta = with stdenv.lib; {
@@ -28,6 +28,6 @@ buildPythonPackage rec {
2828 homepage = https://github.com/Ultimaker/libArcus;
2929 license = licenses.lgpl3Plus;
3030 platforms = platforms.linux;
31− maintainers = with maintainers; [ abbradar ];
31+ maintainers = with maintainers; [ abbradar gebner ];
3232 };
3333}
pkgs/development/python-modules/libsavitar/default.nix+4−4
@@ -2,18 +2,18 @@
22
33buildPythonPackage rec {
44 pname = "libsavitar";
5− version = "4.1.0";
5+ version = "4.2.0";
66 format = "other";
77
88 src = fetchFromGitHub {
99 owner = "Ultimaker";
1010 repo = "libSavitar";
1111 rev = version;
12− sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf";
12+ sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1";
1313 };
1414
1515 postPatch = ''
16− sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
16+ sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
1717 '';
1818
1919 nativeBuildInputs = [ cmake ];
@@ -27,6 +27,6 @@ buildPythonPackage rec {
2727 homepage = https://github.com/Ultimaker/libSavitar;
2828 license = licenses.lgpl3Plus;
2929 platforms = platforms.unix;
30− maintainers = with maintainers; [ abbradar orivej ];
30+ maintainers = with maintainers; [ abbradar orivej gebner ];
3131 };
3232}
pkgs/development/python-modules/uranium/default.nix+3−3
@@ -2,7 +2,7 @@
22, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
33
44buildPythonPackage rec {
5− version = "4.1.0";
5+ version = "4.2.0";
66 pname = "uranium";
77 format = "other";
88
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 owner = "Ultimaker";
1111 repo = "Uranium";
1212 rev = version;
13− sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj";
13+ sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9";
1414 };
1515
1616 disabled = pythonOlder "3.5.0";
@@ -32,6 +32,6 @@ buildPythonPackage rec {
3232 homepage = https://github.com/Ultimaker/Uranium;
3333 license = licenses.lgpl3Plus;
3434 platforms = platforms.linux;
35− maintainers = with maintainers; [ abbradar ];
35+ maintainers = with maintainers; [ abbradar gebner ];
3636 };
3737}