diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-10 23:32:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-10 23:32:31 +0200 |
commit | 8bd9f064db8bc9c521e347aa9cd271f5411270a1 (patch) | |
tree | bf312a4c562e8fe77b11825d1dd3fe71a3f1d987 /pkgs/applications/misc | |
parent | d871acb3b27bebe540a1cc861211fc8b44778b0a (diff) | |
parent | 4c73d164d487932f29e74a9317dc5a0f2cab8c2f (diff) | |
download | nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar.gz nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar.bz2 nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar.lz nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar.xz nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.tar.zst nixlib-8bd9f064db8bc9c521e347aa9cd271f5411270a1.zip |
Merge pull request #41623 from jfrankenau/update-cura
cura: 3.2.1 -> 3.3.1
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/cura/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/curaengine/default.nix | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 10f6837761bb..3b00bba709a0 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,27 +2,30 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; + sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = "3.2.1"; - sha256 = "1kr9ga727x0kazw2ypac9bi6g6lddbsx80qw8fbn0514kg2mr9n3"; + rev = "3.3.0"; + sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q"; }; buildInputs = [ qtbase qtquickcontrols2 ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; - cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; + cmakeFlags = [ + "-DURANIUM_DIR=${python3.pkgs.uranium.src}" + "-DCURA_VERSION=${version}" + ]; postPatch = '' sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index c3a19e6551a2..ac4c68f9b536 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; + sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libarcus ]; - enableParallelBuilding = true; + cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; |