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

cura: 4.8.0 -> 4.9.0

commit9fecb15e9fdeb67966176e308c3d52d405985672 authorGabriel Ebner <gebner@gebner.org> dateSun 25 Apr 2021, 16:44 (6 years ago) parentd656c1853657d7
6 files changed+27−17
compare with master
unifiedsplit
pkgs/applications/misc/cura/default.nix+3−3 pkgs/applications/misc/cura/plugins.nix+15−5 pkgs/applications/misc/curaengine/default.nix+3−3 pkgs/development/python-modules/libarcus/default.nix+2−2 pkgs/development/python-modules/libsavitar/default.nix+2−2 pkgs/development/python-modules/uranium/default.nix+2−2
pkgs/applications/misc/cura/default.nix+3−3
@@ -3,13 +3,13 @@
33
44mkDerivation rec {
55 pname = "cura";
6− version = "4.8.0";
6+ version = "4.9.0";
77
88 src = fetchFromGitHub {
99 owner = "Ultimaker";
1010 repo = "Cura";
1111 rev = version;
12− sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m";
12+ sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2";
1313 };
1414
1515 materials = fetchFromGitHub {
@@ -22,7 +22,7 @@ mkDerivation rec {
2222 buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
2323 propagatedBuildInputs = with python3.pkgs; [
2424 libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d
25− sentry-sdk trimesh
25+ sentry-sdk trimesh keyring
2626 ] ++ plugins;
2727 nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
2828
pkgs/applications/misc/cura/plugins.nix+15−5
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }:
22
33let
44
@@ -34,18 +34,28 @@ let
3434
3535 rawmouse = stdenv.mkDerivation rec {
3636 pname = "RawMouse";
37− version = "1.0.13";
37+ version = "1.1.0";
3838
3939 src = fetchFromGitHub {
4040 owner = "smartavionics";
4141 repo = pname;
4242 rev = version;
43− sha256 = "1cj40pgsfcwliz47mkiqjbslkwcm34qb1pajc2mcljgflcnickly";
43+ sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
4444 };
4545
46+ nativeBuildInputs = [ jq ];
47+
48+ propagatedBuildInputs = with python3Packages; [
49+ hidapi
50+ ];
51+
4652 buildPhase = ''
47− substituteInPlace RawMouse/config.json --replace \
48− /usr/local/lib/libspnav.so ${libspnav}/lib/libspnav.so
53+ jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \
54+ <RawMouse/config.json >RawMouse/config.json.new
55+ mv RawMouse/config.json.new RawMouse/config.json
56+
57+ # remove prebuilt binaries
58+ rm -r RawMouse/hidapi
4959 '';
5060
5161 installPhase = ''
pkgs/applications/misc/curaengine/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "curaengine";
5− version = "4.8.0";
5+ version = "4.9.0";
66
77 src = fetchFromGitHub {
88 owner = "Ultimaker";
99 repo = "CuraEngine";
1010 rev = version;
11− sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2";
11+ sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 meta = with lib; {
2020 description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
2121 homepage = "https://github.com/Ultimaker/CuraEngine";
22− license = licenses.agpl3;
22+ license = licenses.agpl3Only;
2323 platforms = platforms.linux;
2424 maintainers = with maintainers; [ abbradar gebner ];
2525 };
pkgs/development/python-modules/libarcus/default.nix+2−2
@@ -3,14 +3,14 @@
33
44buildPythonPackage rec {
55 pname = "libarcus";
6− version = "4.8.0";
6+ version = "4.9.0";
77 format = "other";
88
99 src = fetchFromGitHub {
1010 owner = "Ultimaker";
1111 repo = "libArcus";
1212 rev = version;
13− sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm";
13+ sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2";
1414 };
1515
1616 disabled = pythonOlder "3.4.0";
pkgs/development/python-modules/libsavitar/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "libsavitar";
5− version = "4.8.0";
5+ version = "4.9.0";
66 format = "other";
77
88 src = fetchFromGitHub {
99 owner = "Ultimaker";
1010 repo = "libSavitar";
1111 rev = version;
12− sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh";
12+ sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h";
1313 };
1414
1515 postPatch = ''
pkgs/development/python-modules/uranium/default.nix+2−2
@@ -2,7 +2,7 @@
22, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
33
44buildPythonPackage rec {
5− version = "4.7.1";
5+ version = "4.9.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 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh";
13+ sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn";
1414 };
1515
1616 disabled = pythonOlder "3.5.0";