public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41623 from jfrankenau/update-cura

Browse Source 
cura: 3.2.1 -> 3.3.1
This commit is contained in:
xeji 2018-06-10 23:32:31 +02:00 committed by GitHub
commit 8bd9f064db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/cura/default.nix
View File

@ -2,27 +2,30 @@
mkDerivation rec { mkDerivation rec {
name = "cura-${version}"; name = "cura-${version}";
version = "3.2.1"; version = "3.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Cura"; repo = "Cura";
rev = version; rev = version;
sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx";
}; };
materials = fetchFromGitHub { materials = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "fdm_materials"; repo = "fdm_materials";
rev = "3.2.1"; rev = "3.3.0";
sha256 = "1kr9ga727x0kazw2ypac9bi6g6lddbsx80qw8fbn0514kg2mr9n3"; sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q";
}; };
buildInputs = [ qtbase qtquickcontrols2 ]; buildInputs = [ qtbase qtquickcontrols2 ];
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ]; cmakeFlags = [
"-DURANIUM_DIR=${python3.pkgs.uranium.src}"
"-DCURA_VERSION=${version}"
];
postPatch = '' postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

6
pkgs/applications/misc/curaengine/default.nix
View File

@ -2,19 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curaengine-${version}"; name = "curaengine-${version}";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "CuraEngine"; repo = "CuraEngine";
rev = version; rev = version;
sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus ]; buildInputs = [ libarcus ];
enableParallelBuilding = true; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";

4
pkgs/development/python-modules/libarcus/default.nix
View File

@ -7,7 +7,7 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libarcus"; pname = "libarcus";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Communication library between internal components for Ultimaker software"; description = "Communication library between internal components for Ultimaker software";
homepage = "https://github.com/Ultimaker/libArcus"; homepage = https://github.com/Ultimaker/libArcus;
license = licenses.agpl3; license = licenses.agpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];

13
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake { lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake, fetchpatch
, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs , lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
, withWebSockets ? false, qtwebsockets , withWebSockets ? false, qtwebsockets
, withConnectivity ? false, qtconnectivity , withConnectivity ? false, qtconnectivity
@ -64,6 +64,17 @@ in buildPythonPackage {
runHook postConfigure runHook postConfigure
''; '';
patches = [
# This patch from Arch Linux fixes Cura segfaulting on startup
# https://github.com/Ultimaker/Cura/issues/3438
# It can probably removed on 5.10.3
(fetchpatch {
name = "pyqt5-cura-crash.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f;
sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck";
})
];
postInstall = '' postInstall = ''
for i in $out/bin/*; do for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"