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

Merge "cura: 3.4.1 -> 3.6.0"

Browse Source
This commit is contained in:
Orivej Desh 2018-12-27 02:25:14 +00:00
commit 056627a3bf
6 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,24 +2,26 @@
mkDerivation rec {
name = "cura-${version}";
version = "3.4.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w";
sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90";
};
materials = fetchFromGitHub {
owner = "Ultimaker";
repo = "fdm_materials";
rev = "3.4.1";
sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28";
rev = version;
sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12";
};
buildInputs = [ qtbase qtquickcontrols2 ];
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
propagatedBuildInputs = with python3.pkgs; [
libsavitar numpy-stl pyserial requests uranium zeroconf
];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [
@ -44,7 +46,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = https://github.com/Ultimaker/Cura;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

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

@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
version = "3.4.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4";
sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm";
};
patches = [
# Fixed upstream, but not yet released
(fetchpatch {
url = "https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch";
sha256 = "1hxbslzhkvdg8p33mvlbrpw62gwfqpsdbfca6yhdng9hifl86j3f";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus stb ];

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

@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "libarcus";
version = "3.4.1";
version = "3.6.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk";
sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43";
};
disabled = pythonOlder "3.4.0";
@ -26,7 +26,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Communication library between internal components for Ultimaker software";
homepage = https://github.com/Ultimaker/libArcus;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

33
pkgs/development/python-modules/libsavitar/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }:
buildPythonPackage rec {
pname = "libsavitar";
version = "3.6.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv";
};
postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
'';
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ];
disabled = pythonOlder "3.4.0";
meta = with stdenv.lib; {
description = "C++ implementation of 3mf loading with SIP python bindings";
homepage = https://github.com/Ultimaker/libSavitar;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar orivej ];
};
}

6
pkgs/development/python-modules/uranium/default.nix
View File

@ -2,7 +2,7 @@
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "3.5.1";
version = "3.6.0";
pname = "uranium";
format = "other";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
sha256 = "1qfci5pl4yhirkkck1rm4i766j8gi56p81mfc6vgbdnhchcjyhy9";
sha256 = "02hid13h8anb9bgv2hhrcdg10bxdxa9hj9pbdv3gw3lpn9r2va98";
};
disabled = pythonOlder "3.5.0";
@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A Python framework for building Desktop applications";
homepage = https://github.com/Ultimaker/Uranium;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

6
pkgs/top-level/python-packages.nix
View File

@ -2824,6 +2824,8 @@ in {
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
libarcus = callPackage ../development/python-modules/libarcus { };
libcloud = callPackage ../development/python-modules/libcloud { };
libgpuarray = callPackage ../development/python-modules/libgpuarray {
@ -2842,6 +2844,8 @@ in {
inherit (pkgs) libsodium;
};
libsavitar = callPackage ../development/python-modules/libsavitar { };
libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
@ -4493,8 +4497,6 @@ in {
inherit (pkgs) libasyncns pkgconfig;
};
libarcus = callPackage ../development/python-modules/libarcus { };
pybrowserid = callPackage ../development/python-modules/pybrowserid { };
pyzmq = callPackage ../development/python-modules/pyzmq { };