blender: implement multiple versions, move to fetchFromGitea #257780

the-furry-hubofeverything · 2023-09-28T06:57:01Z

Description of changes

I've changed the fetchurl to fetchFromGitea, to find the tagged sources easier (at the cost of download speed, I've found projects.blender.org isn't as fast as downloads.blender.org).

I ran into issues with applying the draco.patch to the addon repo, so I split it in two, patching each repo seperately.

I've roughly referenced pkgs/minecraft-servers/default.nix for my json to packages implementation, since I don't have much experience with nixpkgs. If that's not okay, please let me know.

I moved a lot of the original code, but I kept it the same for the most part. I'm new to writing for nixpkgs, so I'm only implementing the parts I know and a major refactor of the original code is not within scope.

Things done

pkgs/applications/misc/blender/versions.json

veprbl · 2023-09-28T17:35:47Z

pkgs/top-level/all-packages.nix


-  blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { };
+  blenderPackages = callPackage ../applications/misc/blender { };


blenderPackages is not the attribute naming scheme for versioning. Look at how it's done in e.g. boost.

Moved to blender3_x, blender3_x-hip, and with blender, blender-lts, blender-hip etc

Please see
https://nixos.org/manual/nixpkgs/stable/#sec-versioning for file organization
and last bullet of https://nixos.org/manual/nixpkgs/stable/#sec-package-naming for blender_3

So blender_3_x, blender-hip_3_x?

The _x is omitted.

The _x is omitted.

I don't understand what you mean.

The example in the link you gave me (https://nixos.org/manual/nixpkgs/stable/#sec-package-naming) with their example has json-c_0_9 and json-c_0_11.

If you mean blender_3x, personally I think that's confusing, given previously blender has versions like 2.93, and blender uses these to indicate API breaking changes (major and minor versions).

pkgs/top-level/all-packages.nix

the-furry-hubofeverything · 2023-10-02T08:54:02Z

Almost ready. I just need to clean up the nix code.

pkgs/top-level/all-packages.nix

the-furry-hubofeverything · 2023-10-04T07:15:53Z

Almost ready. I just need to clean up the nix code.

Completely forgot wrapper.nix.

Okay, so, currently we have a couple of decisions to make.

Version naming conventions

So far I've gotten three options

all on top-level

Based on naming convention of boost, but using inherit (recurseIntoAttrs for specific versions. It has the advantage of not break overrides but it is expensive.
Also, all-packages.nix needs to update every minor version change.

blender
blender-lts
blender-hip
blender-hip-lts
blender_3_x
blender-hip_3_x

with `blenderVersions`(currently implmented)

Based on nixVersions, might remove blender-hip-lts and leave blender-hip only for backwards compatibility. Doesn't need changes to all-packages.nix for minor version updates. My preferred choice.

blender
blender-lts
blender-hip
blender-hip-lts
blenderVersions
- blender_3_x
- blender-hip_3_x
- lts
- stable

condensed `blenderVersions`

Users can define blenderVersions.blender_3_x.override { hipSupport = true; }; if they want it. Generates the least amount of package entries in blenderVersions.

blender
blender-lts
blender-hip
blender-hip-lts
blenderVersions
- blender_3_x
- lts
- stable

blender-with-packages

From what I understand, blender-with-packages is a wrapper for Blender, but I don't understand how it works.

I assume it allows other packages to work with Blender, like using bpy. I think, at it's current state, it only works with the blender alias. Would it be feasible to generate a wrapper for each Blender version (blenderVersions.blender_3_x-with-packages)?

But then for existing packages in nixpkgs (i'm only aware of bpycv so far), how would they implement their package for multiple versions of Blender?

Opinions? @lucasew (for bpycv) @veprbl @pennae @cillianderoiste

lucasew · 2023-10-04T13:39:57Z

blender-with-packages basically do what python.with-packages does. Blender 2.x still uses python 3.9 and 3.x python 3.10 and we had a problem with linking which python packages are supported for each blender version.

As far as I remember it takes blender as the first parameter and from a passthru attribute gets which python package set it supports (like python.pkgs).

pkgs/applications/misc/blender/derivation.nix

the-furry-hubofeverything · 2023-10-06T11:37:38Z

blender_3_3 doesn't pass render test,

@amarshall you wrote the unit test, I don't know much about command-line use in blender, do you think there's an argument change or something I've missed?

pkgs/applications/misc/blender/derivation.nix

pkgs/applications/misc/blender/wrapper.nix

lucasew · 2023-10-08T14:19:39Z

blender_3_3 doesn't pass render test,

@amarshall you wrote the unit test, I don't know much about command-line use in blender, do you think there's an argument change or something I've missed?

Which error?

the-furry-hubofeverything · 2023-10-08T15:34:34Z

blender_3_3 doesn't pass render test,
@amarshall you wrote the unit test, I don't know much about command-line use in blender, do you think there's an argument change or something I've missed?

Which error?

I forgot to include the log, sorry

copying path '/nix/store/5g9nilk7v6lv4gipybskiv91q36k8ww9-libelf-0.8.13' from 'https://cache.nixos.org'...
copying path '/nix/store/nm7al9rc9a81q5y7p942xh96n2smbg1j-llvm-15.0.7-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/qznjbcwwn39dnbd6rppr5gzsl2w916s3-libxshmfence-1.3.2' from 'https://cache.nixos.org'...
copying path '/nix/store/ja4ax8704yaap28a9v0xqbpx2ag8sckc-mesa-23.1.7' from 'https://cache.nixos.org'...
copying path '/nix/store/2j7b1ngdvqd0bidb6bn9icskwm6sq63v-perl-5.38.0' from 'https://cache.nixos.org'...
copying path '/nix/store/lf9pzvvg1y6kl4w89fh9cs73in0l5d39-stdenv-linux' from 'https://cache.nixos.org'...
copying path '/nix/store/17zxjnpgh8327zyfvbznn7p9r3nnykal-lm-sensors-3.6.0' from 'https://cache.nixos.org'...
copying path '/nix/store/swmp8c9a8indr65dkdmxjc1f26lgib40-mesa-23.1.7-drivers' from 'https://cache.nixos.org'...
Rendering with BLENDER_EEVEE...
Blender 3.3.11
could not get a list of mounted file-systems
GHOST/Wayland: error: XDG_RUNTIME_DIR is invalid or not set in the environment.
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x33ef963]
/nix/store/9a9hfbv339z3jla9j59ql9q17wrs8sk1-wayland-1.22.0/lib/libwayland-client.so.0(+0xba1a) [0x7ffff7f21a1a]
/nix/store/9a9hfbv339z3jla9j59ql9q17wrs8sk1-wayland-1.22.0/lib/libwayland-client.so.0(wl_display_connect+0x2e7) [0x7ffff7f1dc07]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x1c5b35a]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x1c49aad]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x1c485d9]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0xb298f1]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0xb12e97]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0xc30eb5]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x1963e09]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x19647c5]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x1968797]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x196ad50]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x196bb69]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x586292]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x3307dde]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x534434]
/nix/store/ld03l52xq2ssn4x0g5asypsxqls40497-glibc-2.37-8/lib/libc.so.6(+0x23ace) [0x7fffe9e3dace]
/nix/store/ld03l52xq2ssn4x0g5asypsxqls40497-glibc-2.37-8/lib/libc.so.6(__libc_start_main+0x89) [0x7fffe9e3db89]
/nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender() [0x583ae5]
Unable to open a display
/build/.attr-0l2nkwhif96f51f4amnlf414lhl4rv9vh8iffyp431v6s28gsr90: line 19:     7 Aborted                 (core dumped) /nix/store/vmf7cqhrgk6fj2qdpjdx05szxkhpfx4a-blender-3.3.11/bin/blender --background -noaudio --factory-startup --python-exit-code 1 --python scene-config.py --engine "$engine" --render-output "$out/$engine" --render-frame 1

the-furry-hubofeverything · 2023-12-15T04:40:56Z

Would it be easier to review this PR if it were to be split up to several smaller ones?

SharzyL · 2023-12-15T06:10:31Z

It seems that you need to rebase your commits

the-furry-hubofeverything · 2023-12-15T16:41:01Z

Dear lord- (didn't notice diff size)

Fixes patching issue. Blender-addons-contrib is not included, as decided upstream.

Git/Github seems to be confused for this rename, so a separate commit is needed.

moved derivation to generic.nix, passthrough `pythonPackages` roughly referenced pkgs/minecraft-servers/default.nix blender_3_3: init 3.3.14 blender_3_6: init 3.6.7 blender_4_0: init 4.0.2

the-furry-hubofeverything · 2023-12-15T18:06:53Z

I'll split it up when I get the time to do so. Will set to draft (and maybe eventually close) since

The two commits that need to be squashed ("blender: implement multi version packages")
Blender 3.3 doesn't build on opencolorio 2.3 😧
It's getting very big and messy

SuperSandro2000

mostly formatting and design things

SuperSandro2000 · 2023-12-19T16:08:01Z

pkgs/applications/misc/blender/default.nix

+
+        # TODO Consider following https://vfxplatform.com/ for dependency tracking
+        # Like "VFX_RefCY": "2024", which outlines python 3.11, qt 6.5+ etc
+        pythonPackages = python310Packages;


Suggested change

pythonPackages = python310Packages;

python3Packages = python310Packages;

lets make it clear that we are not using python2 here

SuperSandro2000 · 2023-12-19T16:26:00Z