diff options
author | Gabriel Ebner <gebner@gebner.org> | 2020-12-06 15:01:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-06 15:01:04 +0100 |
commit | a6dabb2a868c70a7628052d0bd60f9419633ee06 (patch) | |
tree | b3cd38b095a09cb4d51127b9aaf68bb94addf4bd /pkgs/applications | |
parent | b07dcf9715664ff0f2caf8f6da4ab46d54518546 (diff) | |
parent | b9e970027f9292773c69d1498b32ccc591f30900 (diff) |
Merge pull request #103941 from poita66/cura_4.8.0
cura: 4.7.1 -> 4.8.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/cura/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/misc/curaengine/default.nix | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c0aa0a481bdc..46143747f6d9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,26 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, + qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { pname = "cura"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r"; + sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z"; + sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ - libsavitar numpy-stl pyserial requests uranium zeroconf + libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 5cc5db3115fb..8993c01a6bd2 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.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm"; + sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; }; nativeBuildInputs = [ cmake ]; |