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

super-slicer: init at 2.2.53.1 #96882

Merged
merged 1 commit into from Sep 12, 2020
Merged

Conversation

cab404
Copy link
Member

@cab404 cab404 commented Sep 1, 2020

Motivation for this change

Added SuperSlicer — PrusaSlicer fork with more features and faster development cycle.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

Copy link
Contributor

@Moredread Moredread left a comment

Choose a reason for hiding this comment

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

I only had a cursory look, but mostly looks good :)

Also it would be good to trade the changes onto master instead of merging, there seems to be a merge in the PR.

pkgs/applications/misc/prusa-slicer/super-slicer.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/prusa-slicer/super-slicer.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/prusa-slicer/super-slicer.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/prusa-slicer/super-slicer.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/prusa-slicer/super-slicer.nix Outdated Show resolved Hide resolved
@Moredread
Copy link
Contributor

@GrahamcOfBorg build super-slicer

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/290

@cab404
Copy link
Member Author

cab404 commented Sep 6, 2020

@Moredread pls :D

Copy link
Contributor

@Moredread Moredread left a comment

Choose a reason for hiding this comment

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

Sorry, looks good :)

src = fetchFromGitHub {
owner = "supermerill";
repo = "SuperSlicer";
sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs=";
Copy link
Contributor

@Moredread Moredread Sep 9, 2020

Choose a reason for hiding this comment

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

Just out of interest, what do you use to generate the hashes? I get them in the form of e.g.

06spy2zk8jik7yc4jvld6666flz2gj2rq4rsc74zadxp1scp0208

not encoded as base56 like above. For example when I alter the hash so the build fails (my go to method when I just quickly want to update a derivation) I get

hash mismatch in fixed-output derivation '/nix/store/nrgz6mb2zjk4lhk9qmqj32816qgragpf-source':
  wanted: sha256:06spy2zk8jik7yc4jvld6666flz2gj2rq4rsc74zadxp1scp0201
  got:    sha256:06spy2zk8jik7yc4jvld6666flz2gj2rq4rsc74zadxp1scp0208

for this commit.

Copy link
Member Author

Choose a reason for hiding this comment

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

I did nix-prefetch-github, and on nix-unstable it always returns this type of hash

Copy link
Member

Choose a reason for hiding this comment

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

@cab404 please, can you run it with sha256= stdenv.lib.fakeSha256;?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

@dali99 well, mainly by curiousity. This is the way I use to modify the source hashes: the Nix command fails and then spits out the true hash.

Copy link
Member Author

Choose a reason for hiding this comment

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

@dali99 well, mainly by curiousity. This is the way I use to modify the source hashes: the Nix command fails and then spits out the true hash.

no problemo
but several packages already using that form of hash in nixpkgs

Copy link
Member Author

Choose a reason for hiding this comment

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

@cab404 please, can you run it with sha256= stdenv.lib.fakeSha256;?

error: --- Error --- nix-daemon
hash mismatch in fixed-output derivation '/nix/store/nrgz6mb2zjk4lhk9qmqj32816qgragpf-source':
  wanted: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  got:    sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs=
error: --- Error ------------------------------------------------------------ nix-build
error: --- Error --- nix-daemon
1 dependencies of derivation '/nix/store/1k3hzlqcgprfg4a095hsbfwjly4scyld-super-slicer-2.2.53.1.drv' failed to build

Copy link
Member

Choose a reason for hiding this comment

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

OK to me, hehe!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/218

@AndersonTorres AndersonTorres merged commit 4b4329e into NixOS:master Sep 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants