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.

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

orca-slicer: 2.1.1 -> 2.2.0 #352156

Merged
merged 1 commit into from
Nov 5, 2024
Merged

orca-slicer: 2.1.1 -> 2.2.0 #352156

merged 1 commit into from
Nov 5, 2024

Conversation

jonboh
Copy link
Contributor

@jonboh jonboh commented Oct 29, 2024

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

I've removed previousAttrs.patches from patches as the latest stable release of BambuStudio still needs the meshboolean-const.patch, but OrcaSlicer has already performed this change in their own code. Once the stable release of BambuStudio fixes that issue as well it can be added back again and remove the explicit mention of the 0001 patch. Also, the 0002 patch is no longer necessary.


Add a 👍 reaction to pull requests you find important.

@pinpox
Copy link
Member

pinpox commented Oct 30, 2024

There is also this PR: which fixes some bugs and adds another maintainer. #348091
I think we should merge that first to avoid conflicts

@jopejoe1 jopejoe1 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 30, 2024
@pinpox
Copy link
Member

pinpox commented Oct 30, 2024

@jonboh #348091 fixed some segaults, but made this PR have merge conflicts. Could you rebase against master and test it again?

@jonboh
Copy link
Contributor Author

jonboh commented Oct 30, 2024

rebased and retested, orca-slicer starts ok, slices, and I've been able to upload a print from the slicer to my printer, changing settings is as well ok

@Wulfsta Wulfsta removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 31, 2024
@Wulfsta
Copy link
Member

Wulfsta commented Oct 31, 2024

Built orca-slicer and sliced some models, everything seems to work.

@jonboh for future reference, please do not create pull requests to git repositories from your master branch. Doing so makes simple commands like git fetch upstream pull/352156/head:master unavailable, since it wants to write into the master branch, which already exists.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 31, 2024
@Theaninova
Copy link
Contributor

Runs fine for me, tested using this overlay

(orca-slicer.overrideAttrs (
  final: prev: {
    version = "2.2.0";
    src = fetchFromGitHub {
      owner = "SoftFever";
      repo = "OrcaSlicer";
      rev = "v${final.version}";
      hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI=";
    };
    patches = builtins.filter (
      p:
      (builtins.baseNameOf p) != "0002-fix-build-for-gcc-13.diff"
      && (builtins.baseNameOf p) != "meshboolean-const.patch"
    ) prev.patches;
  }
))

@Artturin Artturin merged commit b37f2c3 into NixOS:master Nov 5, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants