From 6ca05eda861a6dd8be77892fddb1b1fcf858b36b Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 18:20:18 +0800 Subject: [PATCH 1/9] openimageio: move to by-name --- .../default.nix => by-name/op/openimageio/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 deletions(-) rename pkgs/{development/libraries/openimageio/default.nix => by-name/op/openimageio/package.nix} (100%) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/by-name/op/openimageio/package.nix similarity index 100% rename from pkgs/development/libraries/openimageio/default.nix rename to pkgs/by-name/op/openimageio/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a849090ac98..919bfa3a7f45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15501,9 +15501,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - }; - open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; From bfb90a95c3f0905627a5f5ee5eb4b192cc8db0ea Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 20:32:33 +0800 Subject: [PATCH 2/9] openimageio: 2.5.16.0 -> 2.5.17.0, fix incorrect license - v2.5.17.0 was released on Nov 1, 2024, includes bug fixes - openimageio relicense their code under Apache 2.0 https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/3905 - remove unnecessary patch - remove `rec` and `with lib;` --- pkgs/by-name/op/openimageio/package.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index adb25d2ab3ae..85210300c054 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -15,23 +15,17 @@ fmt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "2.5.16.0"; + version = "2.5.17.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; - rev = "v${version}"; - hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU="; }; - # Workaround broken zlib version detection in CMake < 3.37. - postPatch = '' - substituteInPlace ./src/cmake/Config.cmake.in \ - --replace " @ZLIB_VERSION@" "" - ''; - outputs = [ "bin" "out" @@ -73,11 +67,11 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib" ''; - meta = with lib; { + meta = { homepage = "https://openimageio.org"; description = "Library and tools for reading and writing images"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + platforms = lib.platforms.unix; }; -} +}) From 9e60f372c3a58f1fd8eb690780cccbcd9e0325f4 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 20:46:54 +0800 Subject: [PATCH 3/9] openimageio: 2.5.17.0 -> 3.0.5.0; openimageio_2: init at 2.5.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Openimageio v3 was released in Nov 9, 2024. However, v3 introduces many breaking changes that some consumers are not yet ready for, and updating them would require complex changes. To address this, we’ve introduced openimageio_2 at version 2.5.17.0. This legacy package is expected to be removed once it is no longer used in nixpkgs. --- pkgs/by-name/op/openimageio/2.nix | 15 +++++++++++++++ pkgs/by-name/op/openimageio/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/op/openimageio/2.nix diff --git a/pkgs/by-name/op/openimageio/2.nix b/pkgs/by-name/op/openimageio/2.nix new file mode 100644 index 000000000000..d31dd2190a51 --- /dev/null +++ b/pkgs/by-name/op/openimageio/2.nix @@ -0,0 +1,15 @@ +{ fetchFromGitHub, openimageio }: + +let + version = "2.5.17.0"; +in +openimageio.overrideAttrs { + inherit version; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenImageIO"; + tag = "v${version}"; + hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU="; + }; +} diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index 85210300c054..00965236dc63 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "2.5.17.0"; + version = "3.0.5.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; tag = "v${finalAttrs.version}"; - hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU="; + hash = "sha256-CG2tb6jf7xmQnrLaTqEFKG3g4nkEwZoI44bXxdCRmrM="; }; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919bfa3a7f45..ce68fe594d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15501,6 +15501,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + openimageio_2 = callPackage ../by-name/op/openimageio/2.nix { }; + open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; From 45d72c1389da09d31a087a9c05cc661bb29fb59f Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 20:54:43 +0800 Subject: [PATCH 4/9] embree{,2}: use openimageio_2 --- pkgs/development/libraries/embree/2.x.nix | 4 ++-- pkgs/development/libraries/embree/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index c3a0adf867e9..a4fd44accf6f 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -7,7 +7,7 @@ ispc, tbb, glfw, - openimageio, + openimageio_2, libjpeg, libpng, libpthreadstubs, @@ -35,7 +35,7 @@ stdenv.mkDerivation { ispc tbb glfw - openimageio + openimageio_2 libjpeg libpng libX11 diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index ace060f54d07..96e431e14c05 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -7,7 +7,7 @@ ispc, tbb, glfw, - openimageio, + openimageio_2, libjpeg, libpng, libpthreadstubs, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ tbb glfw - openimageio + openimageio_2 libjpeg libpng libX11 From 9064f8b741258ff5a70298eefd620d44772e2afa Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 20:55:48 +0800 Subject: [PATCH 5/9] osl: use openimageio_2 --- pkgs/development/compilers/osl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 17df7fa6f050..8a4f54b091c7 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,7 +8,7 @@ libxml2, zlib, openexr, - openimageio, + openimageio_2, llvm, boost, flex, @@ -20,9 +20,7 @@ }: let - boost_static = boost.override { enableStatic = true; }; - in stdenv.mkDerivation rec { pname = "openshadinglanguage"; @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { libclang llvm openexr - openimageio + openimageio_2 partio pugixml python3.pkgs.pybind11 From 6fb1418bfb881931f4ba74a63952362e3ade6645 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 20:56:26 +0800 Subject: [PATCH 6/9] gpupad: use openimageio_2 --- pkgs/by-name/gp/gpupad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix index 7b076839a3d5..d9b87cdc3a47 100644 --- a/pkgs/by-name/gp/gpupad/package.nix +++ b/pkgs/by-name/gp/gpupad/package.nix @@ -7,7 +7,7 @@ glslang, imath, ktx-tools, - openimageio, + openimageio_2, qt6Packages, spdlog, spirv-cross, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { glslang imath # needed for openimageio ktx-tools - openimageio + openimageio_2 qt6Packages.qtbase qt6Packages.qtdeclarative qt6Packages.qtmultimedia From b8aff036fb17a55b341efd94ff17869fcf54bb77 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 21:38:51 +0800 Subject: [PATCH 7/9] python3Packages.materialx: use openimageio_2 --- pkgs/development/python-modules/materialx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 43b766a5662f..d15207ee0a70 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -8,7 +8,7 @@ libX11, libXt, libGL, - openimageio, + openimageio_2, imath, python, apple-sdk_14, @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ - openimageio + openimageio_2 imath ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From b8f327f43c0d3d1a2cdaa80c84f13f8b1a02e83a Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 21:39:07 +0800 Subject: [PATCH 8/9] python3Packages.openusd: use openimageio_2 --- pkgs/development/python-modules/openusd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 0d1c36df8028..da2f0e13effe 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -24,7 +24,7 @@ ninja, numpy, opencolorio, - openimageio, + openimageio_2, opensubdiv, osl, ptex, @@ -132,7 +132,7 @@ buildPythonPackage rec { imath materialx opencolorio - openimageio + openimageio_2 opensubdiv ptex tbb From a7d096c30ab9b5fdfa3fadd78be3b2c52674bf65 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 23 Apr 2025 21:43:53 +0800 Subject: [PATCH 9/9] blender: use openimageio_2 --- 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 ea942a8ec9f6..4a3dff0fe3e5 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -59,7 +59,7 @@ opencolorio, openexr, openimagedenoise, - openimageio, + openimageio_2, openjpeg, openpgl, opensubdiv, @@ -251,7 +251,7 @@ stdenv'.mkDerivation (finalAttrs: { libwebp opencolorio openexr - openimageio + openimageio_2 openjpeg openpgl (opensubdiv.override { inherit cudaSupport; })