Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

curaLulzbot: 3.6.18 -> 3.6.21 #69442

Merged
merged 3 commits into from
Nov 3, 2019
Merged

curaLulzbot: 3.6.18 -> 3.6.21 #69442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff4e645
curaLulzbot: 3.6.18 -> 3.6.20
charles-dyfis-net Sep 26, 2019
de36bdc
curaLulzbot: Adopt fixes from mainline cura package
charles-dyfis-net Sep 26, 2019
b60d3a3
curaLulzbot: 3.6.20 -> 3.6.21
charles-dyfis-net Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/misc/cura/lulzbot/curaengine.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
pname = "curaengine-lulzBot";
version = "3.6.18";
version = "3.6.21";

src = fetchgit {
url = https://code.alephobjects.com/source/curaengine-lulzbot.git;
Expand Down
36 changes: 20 additions & 16 deletions pkgs/applications/misc/cura/lulzbot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
{ lib, mkDerivation, wrapQtAppsHook, callPackage, fetchgit, cmake, jq, python3, qtbase, qtquickcontrols2 }:

let
# admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
curaBinaryDataVersion = "3.6.18"; # Marlin v2.0.0.144. Keep this accurate wrt. the below.
curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others.
curaBinaryData = fetchgit {
url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git;
rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0";
sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb";
rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e";
sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4";
};

libarcusLulzbot = callPackage ./libarcus.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
};
libsavitarLulzbot = callPackage ./libsavitar.nix {
inherit (python3Packages) buildPythonPackage sip pythonOlder;
inherit (python3.pkgs) buildPythonPackage sip pythonOlder;
};

inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
curaengine = callPackage ./curaengine.nix {
inherit libarcusLulzbot;
};
uraniumLulzbot = callPackage ./uranium.nix {
inherit callPackage libarcusLulzbot;
inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
inherit (python3.pkgs) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
};
in
python3Packages.buildPythonApplication rec {
name = "cura-lulzbot-${version}";
version = "3.6.18";
mkDerivation rec {
pname = "cura-lulzbot";
version = "3.6.21";

src = fetchgit {
url = https://code.alephobjects.com/source/cura-lulzbot.git;
rev = "71f1ac5a2b9f535175a3858a565930348358a9ca";
sha256 = "0by06fpxvdgy858lwhsccbmvkdq67j2s1cz8v6jnrnjrsxk7vzka";
rev = "7faeb18604c83004846a02c60cb240708db0034f";
sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq";
};

format = "other"; # using cmake to build
buildInputs = [ qtbase qtquickcontrols2 ];
# numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
nativeBuildInputs = [ cmake python3Packages.wrapPython ];
propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];

cmakeFlags = [
"-DURANIUM_DIR=${uraniumLulzbot.src}"
Expand Down Expand Up @@ -68,6 +67,11 @@ python3Packages.buildPythonApplication rec {
EOF
'';

postFixup = ''
wrapPythonPrograms
wrapQtApp "$out/bin/cura-lulzbot"
'';

meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = https://code.alephobjects.com/diffusion/CURA/;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/misc/cura/lulzbot/libarcus.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

buildPythonPackage {
pname = "libarcus";
version = "3.6.18";
version = "3.6.21";
format = "other";

src = fetchgit {
url = https://code.alephobjects.com/source/arcus.git;
rev = "c795c0644591703ce04e1fd799fc97b1539031aa";
sha256 = "1yap9wbqxbjx3kqyqcsldny4mlcm33ywiwpdjlfgs0wjahfg4ip0";
rev = "aeda02d7727f45b657afb72cef203283fbf09325";
sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99";
};

disabled = pythonOlder "3.4.0";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/misc/cura/lulzbot/libsavitar.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
buildPythonPackage {
pname = "libsavitar-lulzbot";
name = "libsavitar-lulzbot";
version = "3.6.18";
version = "3.6.21";
format = "other";

src = fetchgit {
url = https://code.alephobjects.com/source/savitar.git;
rev = "988a26d35b2a1d042f8c38938ccda77ab146af7d";
sha256 = "146agw3a92azkgs5ahmn2rrck4an78m2r3pcss6ihmb60lx165k7";
rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234";
sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j";
};

postPatch = ''
Expand Down
16 changes: 0 additions & 16 deletions pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions pkgs/applications/misc/cura/lulzbot/uranium.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:

buildPythonPackage {
version = "3.6.18";
version = "3.6.21";
pname = "uranium";
name = "uraniumLulzbot";
format = "other";

src = fetchgit {
url = https://code.alephobjects.com/diffusion/U/uranium.git;
rev = "33df88a7414375ac924ac761113baa48d2ced2b4";
sha256 = "109cbv7y105crbrzfp70lmcr9n20ap5c97i5qd46fmxbx86yj7f8";
rev = "54d911edd2551c5875c554928896122835a0dd6c";
sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i";
};

disabled = pythonOlder "3.5.0";
Expand All @@ -19,9 +19,6 @@ buildPythonPackage {
propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ];
nativeBuildInputs = [ cmake doxygen ];

# Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee
patches = [ ./uranium-qt512-support.patch ];

postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i \
Expand Down