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
mandelbulber: init at 2.20 #66390
mandelbulber: init at 2.20 #66390
Conversation
2a7725e
to
3044ce8
Compare
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.
Looking good. After a quick review I only have cosmetic points to mention. 👍
3044ce8
to
d7ae974
Compare
@GrahamcOfBorg build mandelbulber2 |
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.
Built and tested on NixOS x86_64, examples load and both CPU and OpenCL rendering work. LGTM.
d7ae974
to
ca4f23d
Compare
While it should work on Mac and Windows as well, since I don't have either to test it I haven't added it to the platforms, my thinking was that if someone needs it on that platform they can test it and make it work. |
126f490
to
8090518
Compare
Apparently there are two flags to pass to the C compiler/preprocessor, into which I want a C string, hence I need to enclose the path in double-quotes. Make calls the C compiler in a shell, so I need to escape the double-quotes hence ("). The shell calling |
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.
Built and tested again, LGTM
ping (triage) ... where are we at with this? |
I have folded in the latest changes from jtojnar, and have asked upstream to patch example files buddhi1980/mandelbulber2#719 though that hasn't progressed yet. Apart from that I think that's all the comments addressed |
@KoviRobi Please address bot failures when you get a chance. |
Sure, though not sure how to interpret the failures, all I see is grahamcofborg-eval
grahamcofborg-eval-check-meta
and it doesn't say much to me. |
Looks like the bot just needed to be started again? |
@aanderse I think this is ready to be merged? I have addressed all the comments, and the bot has managed to make everything pass. |
@GrahamcOfBorg build mandelbulber2 |
@KoviRobi any idea on whenthe next upstream release is? That release will eliminate the need for your patch here as your patch was accepted upstream... |
@aanderse I have just asked, apparently in about 2 weeks, so might be worth the wait until then |
10e390c
to
7ba91ac
Compare
Now using the new version, 2.20 which has the hardcoded paths patch included |
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.
Just a few finishing suggestions, mostly style suggestions for cleaner diffs, almost ready to merge.
bb23672
to
5ce0f6a
Compare
5ce0f6a
to
bb23672
Compare
Whoops, I seem to have messed up something with the commits, I just wanted to squash it into a single commit (I think that's preferred in the nixpkgs manual), let me fix that |
bb23672
to
2cab8bf
Compare
Sorry about the accidental mistake, I just did a |
On the website and everywhere else, it seems to be referred as just |
I guess so, I just got the impression that it went by mandelbulber2 for the version 2 (https://repology.org/project/mandelbulber/versions), though it's not a fork and v1 is deprecated (https://sourceforge.net/projects/mandelbulber/files/). Don't know if there was a rewrite/redesign that made or other incompatibilities that made packaging the two separately worthwhile. But anyway we don't have a v1. |
Tested on my machine, see package request NixOS#52038
2cab8bf
to
d6c37ff
Compare
Great work, thanks. |
mandelbulber: init at 2.20 (cherry picked from commit 866dd4c)
Tested on my machine (NixOS 19.03.173243.9ef3cb9b0ba, x86_64), see package request #52038
Motivation for this change
I wanted to generate pretty pictures.
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)