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

blender: 2.79b -> 2.80 #65606

Merged
merged 1 commit into from
Aug 4, 2019
Merged

blender: 2.79b -> 2.80 #65606

merged 1 commit into from
Aug 4, 2019
+10 −19

Conversation

eadwu
Copy link
Member

@eadwu eadwu commented Jul 30, 2019 •
edited
Loading

Just transferring stuff from my overlays.

Motivation for this change
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

cc @goibhniu

Sorry, something went wrong.

eadwu
eadwu commented Jul 30, 2019
View reviewed changes
pkgs/applications/misc/blender/default.nix Outdated

src = fetchurl {
url = "https://download.blender.org/source/${name}.tar.gz";
url = "https://download.blender.org/source/${pname}-${version}.tar.gz";
sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
Copy link
Member Author

@eadwu eadwu Jul 30, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Don't seem to be able to download the file even though it exists, I'll try again later?

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks okay here, probably just blender.org being hammered due to the release announcement. What with them being at SIGGRAPH to show it off and all ^.^

@worldofpeace
Copy link
Contributor

We should be able to merge #52818 (maybe out of date now) right?

@ofborg ofborg bot requested a review from cillianderoiste July 30, 2019 17:59
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 30, 2019
@eadwu
Copy link
Member Author

eadwu commented Jul 30, 2019 •
edited
Loading

Should be fine since it matches the required version [1]. Building from git it completes without any errors.

[1] https://developer.blender.org/diffusion/B/browse/master/build_files/build_environment/cmake/versions.cmake$116

@eyJhb
Copy link
Member

eyJhb commented Jul 30, 2019

@eadwu shouldn't we just fetchfromgit and use tags instead? For me it seems like the best way, also because the mirrors are VERY slow compared to git :)

@ashkitten
Copy link
Contributor

so i merged this pr into my nixpkgs and got this...
image

@eadwu
Copy link
Member Author

eadwu commented Jul 30, 2019

Hash hasn't been calculated.

@eadwu eadwu force-pushed the blender/2.80 branch 2 times, most recently from 99a5cb3 to cd945d2 Compare July 30, 2019 19:58
@eadwu eadwu marked this pull request as ready for review July 30, 2019 21:58
@worldofpeace worldofpeace changed the title blender: 2.97b -> 2.80 blender: 2.70b -> 2.80 Jul 30, 2019
@worldofpeace worldofpeace changed the title blender: 2.70b -> 2.80 blender: 2.79b -> 2.80 Jul 30, 2019
@ar1a
Copy link
Contributor

ar1a commented Jul 31, 2019

that was quick!

@eadwu
Copy link
Member Author

eadwu commented Jul 31, 2019

Well still haven't been able to download the file, although I have reached the 1.0 MiB mark. Through the git source it builds fine with opencollada 1.6.68. Derivation output was /nix/store/fkvwfjsbgs5wqicy3v1i3xqjmbr1wmv0-blender-2.80.

@eyJhb
Copy link
Member

eyJhb commented Jul 31, 2019

@eadwu I got it yesterday, I have put it on my server, feel free to grab it! http://srtutti.zurlius.dk:8394/blender-2.80.tar.gz

@eyJhb
Copy link
Member

eyJhb commented Jul 31, 2019

@eadwu had to put it inside a container, as I was unsure if SimpleHTTPServer is safe. So if your download was interrupted, then restart it :)

@eadwu
Copy link
Member Author

eadwu commented Jul 31, 2019

Downloaded it beforehand and it matched the hash so it's fine to me. Anyway with the source provided by @eyJhb it also compiles fine with opencollada 1.6.68, /nix/store/sbyd66xd3ygqb9awr6j55k2nhmaf3bnx-blender-2.80.

@eyJhb
Copy link
Member

eyJhb commented Jul 31, 2019

@eadwu is there any reason we are not cloning from Git?

@eadwu
Copy link
Member Author

eadwu commented Jul 31, 2019

Not sure, but I don't like changing the source unless it's missing for 2 or more days.

@edolstra
Copy link
Member

edolstra commented Aug 2, 2019

Some changes from my blender-2.80 Nix expression that you may want to copy:

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 353cf620ee7..6d9aa7a4384 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -46,10 +57,7 @@ stdenv.mkDerivation rec {
       "-DWITH_INSTALL_PORTABLE=OFF"
       "-DWITH_FFTW3=ON"
       #"-DWITH_SDL=ON"
-      "-DWITH_GAMEENGINE=ON"
       "-DWITH_OPENCOLORIO=ON"
-      "-DWITH_SYSTEM_OPENJPEG=ON"
-      "-DWITH_PLAYER=ON"
       "-DWITH_OPENSUBDIV=ON"
       "-DPYTHON_LIBRARY=${python.libPrefix}m"
       "-DPYTHON_LIBPATH=${python}/lib"

Also I did still need the wrapProgram to set the PYTHONPATH to numpy but that was a couple of months ago.

@eadwu
Copy link
Member Author

eadwu commented Aug 2, 2019

Verified the hash since I can actually download the source now. Added back the wrapper since blender --python-expr 'import numpy' doesn't work without it.

@jansol
Copy link
Contributor

jansol commented Aug 4, 2019

Is there anything left blocking this?

@eadwu
Copy link
Member Author

eadwu commented Aug 4, 2019

Don't think so.

@worldofpeace worldofpeace merged commit 597f6de into NixOS:master Aug 4, 2019
@eadwu eadwu deleted the blender/2.80 branch November 17, 2020 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra

@jansol jansol

@cillianderoiste cillianderoiste

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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@eadwu @worldofpeace @eyJhb @ashkitten @ar1a @edolstra @jansol