From a1deb65b097b841f0a9f70198617277a3ca9c250 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 4 Jan 2023 22:36:10 +0000 Subject: [PATCH] openimageio: default to openimageio2, rename 1.x to openimageio_1 keep a couple of packages "using" openimageio_1 - both are broken anyway, but as such we have no evidence that they work with 2.x. all are liable to get removed in the near future anyway. --- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/applications/video/natron/default.nix | 4 ++-- pkgs/development/compilers/osl/default.nix | 4 ++-- pkgs/tools/graphics/luxcorerender/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 4251a6919d40..9724ad953673 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python310Packages +, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp - opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib zstd fftw jemalloc + opencolorio openexr openimagedenoise openimageio openjpeg python zlib zstd fftw jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 82eaa30bba3e..b41503b73597 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg openexr opencolorio_1 openimageio boost libGL + libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL seexpr libraw openjpeg libwebp ]; }) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 0af5444e1c8d..5f56966cd489 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -6,7 +6,7 @@ , libclang , zlib , openexr -, openimageio2 +, openimageio , llvm , boost , flex @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { libclang llvm openexr - openimageio2 + openimageio partio pugixml python3.pkgs.pybind11 diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 75e69a5d4996..44ba46895fe1 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,6 +1,6 @@ { lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 , pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr -, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen +, openimagedenoise, openimageio_1, tbb, c-blosc, gtk3, pcre, doxygen # OpenCL Support , withOpenCL ? true, ocl-icd # Cuda Support @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { c-blosc gtk3 pcre - openimageio.dev - openimageio.out + openimageio_1.dev + openimageio_1.out ] ++ lib.optionals withOpenCL [ ocl-icd ] ++ lib.optionals withCuda [ cudatoolkit ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7041d012f4b2..62d4958ef643 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1071,6 +1071,7 @@ mapAliases ({ openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 + openimageio2 = openimageio; # Added 2023-01-05 openisns = open-isns; # Added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 openjpeg_2 = openjpeg; # Added 2021-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 678a2f20519e..39f0b5df10ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31414,11 +31414,11 @@ with pkgs; openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { + openimageio_1 = callPackage ../applications/graphics/openimageio { boost = boost175; }; - openimageio2 = darwin.apple_sdk_11_0.callPackage ../applications/graphics/openimageio/2.x.nix { }; + openimageio = darwin.apple_sdk_11_0.callPackage ../applications/graphics/openimageio/2.x.nix { }; openjump = callPackage ../applications/misc/openjump { };