diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 46143747f6d9..a33cb7b2ce6c 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "cura"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; + sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2"; }; materials = fetchFromGitHub { @@ -22,7 +22,7 @@ mkDerivation rec { buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d - sentry-sdk trimesh + sentry-sdk trimesh keyring ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 4bf7ba8d852a..76a5808963f9 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }: let @@ -34,18 +34,28 @@ let rawmouse = stdenv.mkDerivation rec { pname = "RawMouse"; - version = "1.0.13"; + version = "1.1.0"; src = fetchFromGitHub { owner = "smartavionics"; repo = pname; rev = version; - sha256 = "1cj40pgsfcwliz47mkiqjbslkwcm34qb1pajc2mcljgflcnickly"; + sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw"; }; + nativeBuildInputs = [ jq ]; + + propagatedBuildInputs = with python3Packages; [ + hidapi + ]; + buildPhase = '' - substituteInPlace RawMouse/config.json --replace \ - /usr/local/lib/libspnav.so ${libspnav}/lib/libspnav.so + jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \ + RawMouse/config.json.new + mv RawMouse/config.json.new RawMouse/config.json + + # remove prebuilt binaries + rm -r RawMouse/hidapi ''; installPhase = '' diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 4a4558ba2893..76947c1ed946 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; + sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084"; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; }; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 6e5d8f771e8b..edea85876a84 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.8.0"; + version = "4.9.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm"; + sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; }; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 7ef22e3f6ee5..f6aa1b378f58 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.8.0"; + version = "4.9.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh"; + sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; }; postPatch = '' diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 0c068428f6cc..db8c8c8bd23b 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, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.7.1"; + version = "4.9.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh"; + sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; }; disabled = pythonOlder "3.5.0";