-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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.
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: 15.02.1-1.03-5064 -> 3.6.18 #61054
Conversation
8434f2a
to
5bc8853
Compare
78e2b34
to
667a5f7
Compare
from Aleph Objects. | ||
''; | ||
preFixup = '' | ||
sed -i 's,^import cura.CuraApplication$,import Savitar; import cura.CuraApplication,' "$out/bin/cura-lulzbot" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
substituteInPlace
is preferred here because it complains if no substitution has been made (at least as a logging message).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the review. I've squashed the change 80b975d75c0 in, and checked that the output file is identical / the executable still runs correctly.
80b975d
to
3d89e5d
Compare
3d89e5d
to
701f0cc
Compare
f7efb471e4eb4dde80afb1b2d83781b649770c2f represents the delta between the previously-reviewed content and the 2019-05-23 force-push (which correctly writes a version marker, and pulls in binary blobs enabling firmware management support for Lulzbot printers). |
7a94ff4
to
4bfc14e
Compare
e120602
to
3ce4b5c
Compare
0cf1e81
to
a469b57
Compare
ded9bbf
to
4cd5d1c
Compare
Temporarily removed the |
4cd5d1c
to
2b7091c
Compare
patches = [ | ||
# Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee | ||
(fetchurl { | ||
url = "https://code.alephobjects.com/file/data/bwlg4bwkv4zzqaju4dyi/PHID-FILE-gmlyi636lqqw5ja2il3v/file?diff=1"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This URL no longer works, I get:
trying https://code.alephobjects.com/file/data/bwlg4bwkv4zzqaju4dyi/PHID-FILE-gmlyi636lqqw5ja2il3v/file?diff=1
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (22) The requested URL returned error: 404 Not Found
error: cannot download file?diff=1 from any mirror
builder for '/nix/store/wyxvmn9rfw6whh81s75pdyw9w5y3f0zd-file?diff=1.drv' failed with exit code 1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that's disappointing. If I navigate to the same address now I get the URL https://code.alephobjects.com/file/data/l4x4gxrrqorjwh6twrr2/PHID-FILE-lgeooxasr6hwfqtdzvoo/file?diff=1 -- but my guess is that that one isn't going to be any more stable.
Might just fold it into the source tree. Thank you for checking!
2b7091c
to
c427499
Compare
@gebner -- the version just force-pushed folds in the patch, so we don't depend on having a stable download link. Thank you again for checking! |
c427499
to
bf41643
Compare
Move Cura Lulzbot Edition to be based on the same generation of the codebase as the upstream (Ultimaker) branch, away from a many-year-old legacy tree. Since prior Lulzbot Edition packaging simply wrapped binaries unpacked from Debian binary packages, doing this right requires forking the same dependencies that Lulzbot has branched themselves as well.
bf41643
to
0ca75bc
Compare
curaengine = curaengineLulzbot; | ||
libarcus = python3Packages.libarcusLulzbot; | ||
uranium = python3Packages.uraniumLulzbot; | ||
libsavitar = python3Packages.libsavitarLulzbot; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we don't want to use these python packages in any other place, it might be better to copy them to pkgs/applications/misc/cura/lulzbot
and just reference them here locally.
The reason is that having different versions of a python library will collide in PYTHONPATH
, which is why we want to avoid having different versions of the same library for python.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3a55841
to
784c69a
Compare
Tested and works for me. |
Motivation for this change
Move Cura Lulzbot Edition to be based on the same generation of the codebase as the upstream (Ultimaker) branch, away from a many-year-old legacy tree.
Since prior Lulzbot Edition packaging simply wrapped binaries unpacked from Debian binary packages, doing this right requires forking the same dependencies that Lulzbot has branched themselves as well.
cc: @pjones, @abbradar, @orivej -- I didn't assume that anyone listed as a maintainer for upstream Cura and dependencies also wanted to own the lulzbot edition, but if anyone does want to be in the list, I'd be glad to not be there alone. :)
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Resolves: #64469