Skip to content

Comments

[Backport release-24.11] orca-slicer: v2.3.0-rc -> v2.3.0#392957

Merged
GaetanLepage merged 7 commits intoNixOS:release-24.11from
eduhoribe:backport_orca-slicer
Apr 8, 2025
Merged

[Backport release-24.11] orca-slicer: v2.3.0-rc -> v2.3.0#392957
GaetanLepage merged 7 commits intoNixOS:release-24.11from
eduhoribe:backport_orca-slicer

Conversation

@eduhoribe
Copy link
Contributor

@eduhoribe eduhoribe commented Mar 25, 2025

My main goal with this PR is backporting #391710, but I've hit two roadblocks.

  1. The newer version needs the libnoise package, which is currently not on the release branch.

    • I'm tempted to just backport it too, since:
      • Apparently only Orca Slicer uses it for now
      • libnoise seems to be a rather stable project, just the repo where we are getting the sources is not versioned "properly"
    • Another alternative (which is probably the best one long-term) is using the same fork that Orca Slicer is currently using, which can be found here

  2. The master branch seems to be using GCC 14 by default while the release-24.11 is using GCC 13, which does not have the -Wno-error=template-id-cdtor flag that was added to the orca-slicer package here

    • The fix seems to be rather straight forward, just add the flag if the compiler is GCC 14+, just like Orca Slicer does here, but I'm not sure if this change needs to go to the master branch too, and if so, what would be the proper way of doing it. master first then cherry-pick on the release branch like usual?

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 25, 2025
@nix-owners nix-owners bot requested review from ovlach, pinpox and zhaofengli March 25, 2025 03:38
@eduhoribe eduhoribe force-pushed the backport_orca-slicer branch from df97704 to e3f97a0 Compare March 26, 2025 00:44
@liberodark
Copy link
Contributor

liberodark commented Mar 28, 2025 •
edited
Loading

Hi,

I'm not sure this PR is a good idea.
Because you can easily use custom packages on nixos.
This PR involves a lot of backporting for an app.
But I can confirm that the latest version is functional on Nixos 24.11.
@GaetanLepage can you check this PR ?

Best Regards

@GaetanLepage
Copy link
Contributor

GaetanLepage commented Mar 28, 2025

I am not against this backport.
About the blockers:

  1. You can indeed backport libnoise too. Either in this PR, or in another one.
  2. I would do the change on master first and backport it here.

@liberodark
Copy link
Contributor

liberodark commented Mar 28, 2025

I also don't have any problems with libnoise and orca-slicer 2.3.0; I used it myself on 24.11.
If you absolutely need 2.3.0, I can backport it if you like.
If you feel like doing it yourself, no problem.

@eduhoribe
Copy link
Contributor Author

eduhoribe commented Mar 29, 2025

I'm not in a rush to backport this to the release branch. I've already built the package and installed it locally, so I think we should try to do this backport the proper way™, especially because I want to get my hands dirty with nix.

To make this PR more slim, I'm going to create another one on master just to fix the package compilation on GCC < 14.

Then…about libnoise…should we just backport it as is on master or try to use the Orca Slicer fork? The current one kind of screams "unstable" with its version, even though the code should be pretty much the same.

@eduhoribe eduhoribe mentioned this pull request Mar 29, 2025
Merged
13 tasks
@eduhoribe eduhoribe marked this pull request as draft March 29, 2025 02:43
@GaetanLepage
Copy link
Contributor

GaetanLepage commented Mar 30, 2025

I'm going to create another one on master just to fix the package compilation on GCC < 14.

Merged!

Then…about libnoise…should we just backport it as is on master or try to use the Orca Slicer fork? The current one kind of screams "unstable" with its version, even though the code should be pretty much the same.

I don't think we should deviate from what is being done on master.

@eduhoribe
Copy link
Contributor Author

eduhoribe commented Mar 30, 2025

Merged!

Thanks!

I don't think we should deviate from what is being done on master.

I'll open a backport PR for libnoise then.

@eduhoribe eduhoribe mentioned this pull request Mar 30, 2025
Merged
13 tasks
liberodark and others added 7 commits April 6, 2025 13:30
@liberodark @eduhoribe
orca-slicer: fix gcc14
5f6e1b8 
(cherry picked from commit aa12034)
@liberodark @eduhoribe
orca-slicer v2.2.0-unstable-2025-01-06 -> v2.2.0-unstable-2025-01-23
eae6c6c 
(cherry picked from commit 13eb9ce)
@shelvacu @SuperSandro2000 @eduhoribe
orca-slicer: Don't show update dialog by default (NixOS#378396)
79e878b 
* orca-slicer: Don't show update dialog by default

This pulls in OrcaSlicer/OrcaSlicer#7650 (which I wrote).

The idea is, for the binaries that orca-slicer distributes from its github page, it might make sense to remind about updates because the user wouldn't otherwise know they need to take action to install new versions. But when orca-slicer is run using nix, we can safely assume the user will update using nix and they don't need the nag dialog.

* Update pkgs/by-name/or/orca-slicer/package.nix

---------

Co-authored-by: Shelvacu <git@shelvacu.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 274ea25)
@K900 @eduhoribe
orca-slicer: get rid of osmesa dependency, clean up other mesa-relate…
6b4c20a 
…d things

It's not actually necessary.

(cherry picked from commit d363185)
@liberodark @eduhoribe
orca-slicer: 2.2.0-unstable-2025-01-23 -> 2.3.0-rc
fe3104e 
(cherry picked from commit 2eb815a)
@eduhoribe
orca-slicer: v2.3.0-rc -> v2.3.0
7f9fdd7 
https://github.com/SoftFever/OrcaSlicer/releases/tag/v2.3.0
(cherry picked from commit 42b6fd1)
@eduhoribe
orca-slicer: fixing build on GCC < 14
daa4bc1 
(cherry picked from commit b86e92c)
@eduhoribe eduhoribe force-pushed the backport_orca-slicer branch from e3f97a0 to daa4bc1 Compare April 6, 2025 16:58
@eduhoribe eduhoribe marked this pull request as ready for review April 6, 2025 17:00
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Apr 6, 2025
@GaetanLepage
Copy link
Contributor

GaetanLepage commented Apr 6, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392957

x86_64-linux

✅ 2 packages built:
  • orca-slicer
  • orca-slicer.debug

aarch64-linux

✅ 2 packages built:
  • orca-slicer
  • orca-slicer.debug

GaetanLepage
GaetanLepage approved these changes Apr 8, 2025
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

All good, well done!

@GaetanLepage GaetanLepage merged commit 6c05b89 into NixOS:release-24.11 Apr 8, 2025
37 of 39 checks passed
@eduhoribe
Copy link
Contributor Author

eduhoribe commented Apr 8, 2025

Thank you very much!

@eduhoribe eduhoribe deleted the backport_orca-slicer branch October 10, 2025 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GaetanLepage GaetanLepage GaetanLepage approved these changes

@pinpox pinpox Awaiting requested review from pinpox

@zhaofengli zhaofengli Awaiting requested review from zhaofengli

@ovlach ovlach Awaiting requested review from ovlach

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 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eduhoribe @liberodark @GaetanLepage @shelvacu @K900