From c680dc2c3c614e59876b86f1cf3aad4687549822 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 2 May 2025 18:41:44 -0400 Subject: [PATCH 1/3] blender: add updateScript MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change srcs -> src otherwise nix-update does not update the hash; we don’t need srcs anymore, anyway, as there is now only one. --- pkgs/by-name/bl/blender/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 95f7ca7ddfc8..a58eb975eefc 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -53,6 +53,7 @@ llvmPackages, makeWrapper, mesa, + nix-update-script, openUsdSupport ? !stdenv.hostPlatform.isDarwin, openal, opencollada-blender, @@ -114,7 +115,7 @@ stdenv'.mkDerivation (finalAttrs: { pname = "blender"; version = "4.4.1"; - srcs = fetchzip { + src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0="; @@ -414,6 +415,12 @@ stdenv'.mkDerivation (finalAttrs: { }], check=True) # noqa: E501 ''; }; + + updateScript = nix-update-script { + extraArgs = [ + "--url=https://projects.blender.org/blender/blender" + ]; + }; }; meta = { From fae5884cd526b17142a2babf81375739a313efaa Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 2 May 2025 22:43:13 +0000 Subject: [PATCH 2/3] blender: 4.4.1 -> 4.4.3 Changelog: https://developer.blender.org/docs/release_notes/4.4/corrective_releases/ --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index a58eb975eefc..ca84c9e972ed 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -113,12 +113,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.4.1"; + version = "4.4.3"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0="; + hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg="; }; patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; From fd5cb16913540f281429733c67a813697a9164a4 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 2 May 2025 19:23:36 -0400 Subject: [PATCH 3/3] blender: update OptiX to match upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Determining the current version of OptiX that upstream builds with is somewhat non-trivial. In theory it is [read from the BuildBot config][1], but I don’t know where that lives or how to view it. The only way I know of to determine the version then is to inspect the Blender BuildBot logs. This change was determined by looking at the logs from the `v440-code-daily-linux-x86_64` builder, `compile-gpu` step [logs][2], where it had: > -DOPTIX_ROOT_DIR:PATH=/home/blender/.devops/apps/NVIDIA-OptiX-SDK-7.4.0-linux64-x86_64 [1]: https://projects.blender.org/infrastructure/blender-devops/src/commit/56662c75c39809684055e1c3235ff07ddf8c26b4/buildbot/worker/blender/compile.py#L307 [2]: https://builder.blender.org/admin/#/builders/288/builds/523/steps/4/logs/stdio --- pkgs/by-name/bl/blender/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index ca84c9e972ed..62531b7ac2b9 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -105,9 +105,10 @@ let }); optix = fetchzip { - # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30 - url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; - hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU="; + # Look at upstream Blender BuildBot logs to determine the current version, + # see Git blame here for historical details + url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip"; + hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY="; }; in