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

Merge pull request #120533 from gebner/cura49

Browse Source 
cura: 4.8.0 -> 4.9.0
This commit is contained in:
Gabriel Ebner 2021-04-25 16:44:27 +02:00 committed by GitHub
commit 9fecb15e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "cura"; pname = "cura";
version = "4.8.0"; version = "4.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Cura"; repo = "Cura";
rev = version; rev = version;
sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2";
}; };
materials = fetchFromGitHub { materials = fetchFromGitHub {
@ -22,7 +22,7 @@ mkDerivation rec {
buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d
sentry-sdk trimesh sentry-sdk trimesh keyring
] ++ plugins; ] ++ plugins;
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];

20
pkgs/applications/misc/cura/plugins.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav }: { lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }:
let let
@ -34,18 +34,28 @@ let
rawmouse = stdenv.mkDerivation rec { rawmouse = stdenv.mkDerivation rec {
pname = "RawMouse"; pname = "RawMouse";
version = "1.0.13"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smartavionics"; owner = "smartavionics";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1cj40pgsfcwliz47mkiqjbslkwcm34qb1pajc2mcljgflcnickly"; sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
}; };
nativeBuildInputs = [ jq ];
propagatedBuildInputs = with python3Packages; [
hidapi
];
buildPhase = '' buildPhase = ''
substituteInPlace RawMouse/config.json --replace \ jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \
/usr/local/lib/libspnav.so ${libspnav}/lib/libspnav.so <RawMouse/config.json >RawMouse/config.json.new
mv RawMouse/config.json.new RawMouse/config.json
# remove prebuilt binaries
rm -r RawMouse/hidapi
''; '';
installPhase = '' installPhase = ''

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "curaengine"; pname = "curaengine";
version = "4.8.0"; version = "4.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "CuraEngine"; repo = "CuraEngine";
rev = version; rev = version;
sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with 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";
homepage = "https://github.com/Ultimaker/CuraEngine"; homepage = "https://github.com/Ultimaker/CuraEngine";
license = licenses.agpl3; license = licenses.agpl3Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ abbradar gebner ]; maintainers = with maintainers; [ abbradar gebner ];
}; };

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

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libarcus"; pname = "libarcus";
version = "4.8.0"; version = "4.9.0";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "libArcus"; repo = "libArcus";
rev = version; rev = version;
sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm"; sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2";
}; };
disabled = pythonOlder "3.4.0"; disabled = pythonOlder "3.4.0";

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

@ -2,14 +2,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libsavitar"; pname = "libsavitar";
version = "4.8.0"; version = "4.9.0";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "libSavitar"; repo = "libSavitar";
rev = version; rev = version;
sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh"; sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h";
}; };
postPatch = '' postPatch = ''

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

@ -2,7 +2,7 @@
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.7.1"; version = "4.9.0";
pname = "uranium"; pname = "uranium";
format = "other"; format = "other";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "Ultimaker"; owner = "Ultimaker";
repo = "Uranium"; repo = "Uranium";
rev = version; rev = version;
sha256 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh"; sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn";
}; };
disabled = pythonOlder "3.5.0"; disabled = pythonOlder "3.5.0";