opencolorio: Replace with 2.x

All applications besides Blender have been pinned to 1.x

+17 -18
+2 -2
pkgs/applications/graphics/krita/default.nix
··· 3 3 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem 4 4 , kio, kcrash, breeze-icons 5 5 , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib 6 - , openjpeg, opencolorio, vc, poppler, curl, ilmbase 6 + , openjpeg, opencolorio_1, vc, poppler, curl, ilmbase 7 7 , qtmultimedia, qtx11extras, quazip 8 8 , python3Packages 9 9 }: ··· 23 23 karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons 24 24 ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons 25 25 boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib 26 - openjpeg opencolorio poppler curl ilmbase 26 + openjpeg opencolorio_1 poppler curl ilmbase 27 27 qtmultimedia qtx11extras quazip 28 28 python3Packages.pyqt5 29 29 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
+2 -2
pkgs/applications/graphics/openimageio/2.x.nix
··· 7 7 , libjpeg 8 8 , libpng 9 9 , libtiff 10 - , opencolorio 10 + , opencolorio_1 11 11 , openexr 12 12 , robin-map 13 13 , unzip ··· 39 39 libjpeg 40 40 libpng 41 41 libtiff 42 - opencolorio 42 + opencolorio_1 43 43 openexr 44 44 robin-map 45 45 fmt
+2 -2
pkgs/applications/graphics/openimageio/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff 2 - , opencolorio, openexr, unzip 2 + , opencolorio_1, openexr, unzip 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 18 18 nativeBuildInputs = [ cmake unzip ]; 19 19 buildInputs = [ 20 20 boost ilmbase libjpeg libpng 21 - libtiff opencolorio openexr 21 + libtiff opencolorio_1 openexr 22 22 ]; 23 23 24 24 cmakeFlags = [
+2 -2
pkgs/applications/misc/blender/default.nix
··· 1 1 { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew 2 2 , ilmbase, libXi, libX11, libXext, libXrender 3 3 , libjpeg, libpng, libsamplerate, libsndfile 4 - , libtiff, libGLU, libGL, openal, opencolorio2, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages 4 + , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages 5 5 , openvdb, libXxf86vm, tbb, alembic 6 6 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath 7 7 , jackaudioSupport ? false, libjack2 ··· 40 40 buildInputs = 41 41 [ boost ffmpeg gettext glew ilmbase 42 42 freetype libjpeg libpng libsamplerate libsndfile libtiff 43 - opencolorio2 openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc 43 + opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc 44 44 alembic 45 45 (opensubdiv.override { inherit cudaSupport; }) 46 46 tbb
+3 -3
pkgs/applications/video/natron/default.nix
··· 1 1 { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, 2 2 cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, 3 - poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, 3 + poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio, 4 4 qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: 5 5 6 6 let ··· 58 58 sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c="; 59 59 nativeBuildInputs = [ pkg-config ]; 60 60 buildInputs = [ 61 - pango librsvg librevenge libcdr opencolorio libxml2 libzip 61 + pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip 62 62 poppler imagemagick 63 63 ]; 64 64 preConfigure = '' ··· 74 74 sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; 75 75 nativeBuildInputs = [ pkg-config ]; 76 76 buildInputs = [ 77 - libpng ffmpeg_3 openexr opencolorio openimageio boost libGL 77 + libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL 78 78 seexpr libraw openjpeg libwebp 79 79 ]; 80 80 })
+2 -2
pkgs/applications/video/olive-editor/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, 2 - qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, 2 + qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full, 3 3 CoreFoundation }: 4 4 5 5 mkDerivation rec { ··· 23 23 buildInputs = [ 24 24 ffmpeg-full 25 25 frei0r 26 - opencolorio 26 + opencolorio_1 27 27 qtmultimedia 28 28 ] ++ lib.optional stdenv.isDarwin CoreFoundation; 29 29
+2 -2
pkgs/tools/graphics/appleseed/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, 2 2 eigen, libpng, python, libGLU, qt4, openexr, openimageio, 3 - opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper 3 + opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper 4 4 }: 5 5 6 6 let boost_static = boost165.override { ··· 21 21 nativeBuildInputs = [ cmake pkg-config makeWrapper ]; 22 22 buildInputs = [ 23 23 boost_static guile eigen libpng python 24 - libGLU qt4 openexr openimageio opencolorio xercesc 24 + libGLU qt4 openexr openimageio opencolorio_1 xercesc 25 25 osl seexpr 26 26 ]; 27 27
+2 -3
pkgs/top-level/all-packages.nix
··· 17513 17513 17514 17514 openldap = callPackage ../development/libraries/openldap { }; 17515 17515 17516 - opencolorio1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; 17517 - opencolorio2 = callPackage ../development/libraries/opencolorio { 17516 + opencolorio = callPackage ../development/libraries/opencolorio { 17518 17517 inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; 17519 17518 }; 17520 - opencolorio = opencolorio1; 17519 + opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; 17521 17520 17522 17521 opendmarc = callPackage ../development/libraries/opendmarc { }; 17523 17522