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

Jump to bottom

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

merged 3 commits into from
Nov 3, 2019

Conversation

charles-dyfis-net
Copy link
Contributor

@charles-dyfis-net charles-dyfis-net commented Sep 26, 2019 •
edited
Loading

Motivation for this change

Updates numerous material profiles for recent machines (TAZ Pro, TAZ Workhorse), and fixes some other minor bugs. No changes to slicer engine, firmware, or other dependencies.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

(Author is maintainer).

@charles-dyfis-net
curaLulzbot: 3.6.18 -> 3.6.20
ff4e645 
Updates numerous material profiles for recent machines (TAZ Pro, TAZ
Workhorse), and fixes some other minor bugs.  No changes to slicer
engine, firmware, or other dependencies.
@charles-dyfis-net charles-dyfis-net changed the title Cura le 3.6.20 curaLulzbot: 3.6.18 -> 3.6.20 Sep 26, 2019
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Sep 26, 2019
@charles-dyfis-net
Copy link
Contributor Author

charles-dyfis-net commented Sep 26, 2019 •
edited
Loading

Please consider this PR on-hold -- it looks like the QT_PLUGIN_PATH change may have triggered a regression.

jonringer
jonringer reviewed Sep 26, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's double wrapped :(

$ ls -a ./results/curaLulzbot/bin/
..cura-lulzbot-wrapped-wrapped  .cura-lulzbot-wrapped  cura-lulzbot

@charles-dyfis-net charles-dyfis-net changed the title curaLulzbot: 3.6.18 -> 3.6.20 WIP: curaLulzbot: 3.6.18 -> 3.6.20 Sep 26, 2019
@charles-dyfis-net
Copy link
Contributor Author

When built against master, but not against release-19.03, we're unable to find QtQuick.Controls (and consequently have some UI elements unable to render once running), even when using mkDerivationWith / wrapQtApp / etc (and having qtquickcontrols2 in our buildInputs):

2019-09-25 22:32:54,855 - WARNING - [(140517336824832)-MainThread] UM.Qt.QtApplication.__onQmlWarning [274]: file:///nix/store/rb83hsh2qfnbp156cljrqrg8lchndh51-cura-lulzbot-3.6.20/share/cura/resources/qml/Sidebar.qml:5:1: module "QtQuick.Controls" version 2.1 is not installed

I'm going to call it an evening for now and come back to this later -- but I could see needing to ask @ttuegel for a pointer.

@charles-dyfis-net
Copy link
Contributor Author

...okay, the nice thing about maintaining a fork of an upstream program that's also in nixpkgs is that there's a place to look for hints. :)

As of de36bdc, we're still double-wrapped (like upstream is AFAIK), but the software actually works.

@charles-dyfis-net charles-dyfis-net changed the title WIP: curaLulzbot: 3.6.18 -> 3.6.20 curaLulzbot: 3.6.18 -> 3.6.20 Sep 26, 2019
@charles-dyfis-net charles-dyfis-net changed the title curaLulzbot: 3.6.18 -> 3.6.20 curaLulzbot: 3.6.18 -> 3.6.21 Oct 13, 2019
@charles-dyfis-net
Copy link
Contributor Author

This has moved from 3.6.20 to 3.6.21; notably, upstream has merged proper support for Qt 5.12, so we're able to drop our patch.

(There's also support for the Lulzbot Bio, for anyone having one of those prototypes / beta units).

@gebner
Copy link
Member

gebner commented Nov 3, 2019

@GrahamcOfBorg build curaLulzbot

@gebner gebner merged commit ec43bdc into NixOS:master Nov 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@charles-dyfis-net @gebner @jonringer