openexr: change default version from 2 to 3 (#367406)

authored by Yueh-Shun Li and committed by GitHub e73f48d6 15072f38

+62 -66
+2
doc/release-notes/rl-2505.section.md
··· 25 25 NEWS can been viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. 26 26 It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30). 27 27 28 + - The default openexr version has been updated to 3.2.4. 29 + 28 30 - The default PHP version has been updated to 8.4. 29 31 30 32 - The default Erlang OTP version has been updated to 27.
+2 -2
pkgs/applications/graphics/gimp/default.nix
··· 45 45 libheif, 46 46 libxslt, 47 47 libgudev, 48 - openexr_3, 48 + openexr, 49 49 desktopToDarwinBundle, 50 50 AppKit, 51 51 Cocoa, ··· 126 126 poppler 127 127 poppler_data 128 128 libtiff 129 - openexr_3 129 + openexr 130 130 libmng 131 131 librsvg 132 132 libwmf
+2 -2
pkgs/applications/graphics/krita/generic.nix
··· 30 30 libkdcraw, 31 31 lcms2, 32 32 gsl, 33 - openexr_3, 33 + openexr, 34 34 giflib, 35 35 libjxl, 36 36 mlt, ··· 105 105 fribidi 106 106 lcms2 107 107 gsl 108 - openexr_3 108 + openexr 109 109 lager 110 110 libaom 111 111 libheif
+2 -2
pkgs/applications/kde/kio-extras.nix
··· 24 24 syntax-highlighting, 25 25 libmtp, 26 26 libssh, 27 - openexr_3, 27 + openexr, 28 28 libtirpc, 29 29 phonon, 30 30 qtsvg, ··· 71 71 syntax-highlighting 72 72 libmtp 73 73 libssh 74 - openexr_3 74 + openexr 75 75 libtirpc 76 76 phonon 77 77 qtsvg
+2 -2
pkgs/applications/video/olive-editor/default.nix
··· 12 12 cmake, 13 13 wrapQtAppsHook, 14 14 openimageio, 15 - openexr_3, 15 + openexr, 16 16 portaudio, 17 17 imath, 18 18 qtwayland, ··· 78 78 opencolorio 79 79 openimageio' 80 80 imath 81 - openexr_3 81 + openexr 82 82 portaudio 83 83 qtwayland 84 84 qtmultimedia
+2 -2
pkgs/by-name/an/ansel/package.nix
··· 15 15 libxml2, 16 16 cmake, 17 17 exiftool, 18 - openexr_3, 18 + openexr, 19 19 glib, 20 20 python3Packages, 21 21 perlPackages, ··· 147 147 libxkbcommon 148 148 libxslt 149 149 libXtst 150 - openexr_3 150 + openexr 151 151 openjpeg 152 152 osm-gps-map 153 153 pcre
+2 -2
pkgs/by-name/ar/art/package.nix
··· 32 32 exiv2, 33 33 exiftool, 34 34 mimalloc, 35 - openexr_3, 35 + openexr, 36 36 ilmbase, 37 37 opencolorio, 38 38 color-transformation-language, ··· 83 83 exiftool 84 84 libcanberra-gtk3 85 85 mimalloc 86 - openexr_3 86 + openexr 87 87 ilmbase 88 88 opencolorio 89 89 color-transformation-language
+2 -2
pkgs/by-name/co/color-transformation-language/package.nix
··· 4 4 fetchFromGitHub, 5 5 cmake, 6 6 ilmbase, 7 - openexr_3, 7 + openexr, 8 8 libtiff, 9 9 aces-container, 10 10 }: ··· 23 23 nativeBuildInputs = [ 24 24 cmake 25 25 ilmbase 26 - openexr_3 26 + openexr 27 27 libtiff 28 28 aces-container 29 29 ];
+2 -2
pkgs/by-name/da/darktable/package.nix
··· 55 55 libxslt, 56 56 lua, 57 57 util-linux, 58 - openexr_3, 58 + openexr, 59 59 openjpeg, 60 60 osm-gps-map, 61 61 pcre2, ··· 140 140 libwebp 141 141 libxslt 142 142 lua 143 - openexr_3 143 + openexr 144 144 openjpeg 145 145 osm-gps-map 146 146 pcre2
+5 -3
pkgs/by-name/il/ilmbase/package.nix
··· 3 3 lib, 4 4 buildPackages, 5 5 cmake, 6 - openexr, 6 + # explicitely depending on openexr_2 because ilmbase doesn't exist for v3 7 + openexr_2, 7 8 }: 8 9 9 10 stdenv.mkDerivation { 10 11 pname = "ilmbase"; 11 - version = lib.getVersion openexr; 12 + version = lib.getVersion openexr_2; 12 13 13 14 # the project no longer provides separate tarballs. We may even want to merge 14 15 # the ilmbase package into openexr in the future. 15 - inherit (openexr) src patches; 16 + inherit (openexr_2) src patches; 16 17 17 18 outputs = [ 18 19 "out" ··· 37 38 homepage = "https://www.openexr.com/"; 38 39 license = licenses.bsd3; 39 40 platforms = platforms.all; 41 + insecure = true; 40 42 }; 41 43 }
+2 -2
pkgs/by-name/li/libjxl/package.nix
··· 12 12 libpng, 13 13 libwebp, 14 14 gdk-pixbuf, 15 - openexr_3, 15 + openexr, 16 16 pkg-config, 17 17 makeWrapper, 18 18 zlib, ··· 87 87 libpng 88 88 libwebp 89 89 gdk-pixbuf 90 - openexr_3 90 + openexr 91 91 zlib 92 92 ]; 93 93
-6
pkgs/by-name/li/libyafaray/package.nix
··· 2 2 cmake, 3 3 fetchFromGitHub, 4 4 freetype, 5 - ilmbase, 6 5 lib, 7 6 libjpeg, 8 7 libtiff, ··· 33 32 include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 34 33 ''; 35 34 36 - preConfigure = '' 37 - NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" 38 - ''; 39 - 40 35 nativeBuildInputs = [ 41 36 cmake 42 37 pkg-config ··· 44 39 45 40 buildInputs = [ 46 41 freetype 47 - ilmbase 48 42 libjpeg 49 43 libtiff 50 44 libxml2
+2 -2
pkgs/by-name/sw/swayimg/package.nix
··· 23 23 libavif, 24 24 libsixel, 25 25 libraw, 26 - openexr_3, 26 + openexr, 27 27 bash-completion, 28 28 testers, 29 29 nix-update-script, ··· 76 76 libavif 77 77 libsixel 78 78 libraw 79 - openexr_3 79 + openexr 80 80 ]; 81 81 82 82 passthru = {
+2 -2
pkgs/by-name/vi/vips/package.nix
··· 38 38 libtiff, 39 39 libwebp, 40 40 matio, 41 - openexr_3, 41 + openexr, 42 42 openjpeg, 43 43 openslide, 44 44 pango, ··· 112 112 libtiff 113 113 libwebp 114 114 matio 115 - openexr_3 115 + openexr 116 116 openjpeg 117 117 openslide 118 118 pango
+2 -2
pkgs/development/libraries/gdal/default.nix
··· 62 62 libxml2, 63 63 lz4, 64 64 netcdf, 65 - openexr_3, 65 + openexr, 66 66 openjpeg, 67 67 openssl, 68 68 pcre2, ··· 182 182 nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) ( 183 183 [ 184 184 # tests for formats enabled by these packages fail on macos 185 - openexr_3 185 + openexr 186 186 xercesc 187 187 ] 188 188 ++ arrowDeps
+2 -2
pkgs/development/libraries/gstreamer/bad/default.nix
··· 62 62 libusb1, 63 63 neon, 64 64 openal, 65 - openexr_3, 65 + openexr, 66 66 openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264, 67 67 openh264, 68 68 libopenmpt, ··· 192 192 libusb1 193 193 neon 194 194 openal 195 - openexr_3 195 + openexr 196 196 rtmpdump 197 197 pango 198 198 soundtouch
-1
pkgs/development/libraries/kde-frameworks/kimageformats.nix
··· 30 30 qtbase 31 31 ]; 32 32 outputs = [ "out" ]; # plugins only 33 - CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; 34 33 cmakeFlags = [ 35 34 "-DKIMAGEFORMATS_HEIF=ON" 36 35 ];
+2 -2
pkgs/development/libraries/libdevil/default.nix
··· 8 8 libmng, 9 9 lcms1, 10 10 libtiff, 11 - openexr_3, 11 + openexr, 12 12 libGL, 13 13 libX11, 14 14 pkg-config, ··· 47 47 libmng 48 48 lcms1 49 49 libtiff 50 - openexr_3 50 + openexr 51 51 ] 52 52 ++ lib.optionals withXorg [ 53 53 libX11
+2 -2
pkgs/development/libraries/opencolorio/default.nix
··· 22 22 # Build apps 23 23 buildApps ? true, # Utility applications 24 24 lcms2, 25 - openexr_3, 25 + openexr, 26 26 }: 27 27 28 28 stdenv.mkDerivation rec { ··· 74 74 ] 75 75 ++ lib.optionals buildApps [ 76 76 lcms2 77 - openexr_3 77 + openexr 78 78 ]; 79 79 80 80 cmakeFlags =
+1 -1
pkgs/development/libraries/openexr/3.nix
··· 60 60 61 61 passthru.tests = { 62 62 inherit libjxl; 63 - musl = pkgsCross.musl64.openexr_3; 63 + musl = pkgsCross.musl64.openexr; 64 64 }; 65 65 66 66 meta = with lib; {
+1
pkgs/development/libraries/openexr/default.nix pkgs/development/libraries/openexr/2.nix
··· 74 74 homepage = "https://www.openexr.com/"; 75 75 license = licenses.bsd3; 76 76 platforms = platforms.all; 77 + insecure = true; 77 78 }; 78 79 }
+2 -2
pkgs/development/libraries/openscenegraph/default.nix
··· 25 25 jpegSupport ? true, 26 26 libjpeg, 27 27 exrSupport ? false, 28 - openexr_3, 28 + openexr, 29 29 gifSupport ? true, 30 30 giflib, 31 31 pngSupport ? true, ··· 97 97 zlib 98 98 ] 99 99 ++ lib.optional jpegSupport libjpeg 100 - ++ lib.optional exrSupport openexr_3 100 + ++ lib.optional exrSupport openexr 101 101 ++ lib.optional gifSupport giflib 102 102 ++ lib.optional pngSupport libpng 103 103 ++ lib.optional tiffSupport libtiff
+2 -2
pkgs/kde/frameworks/kimageformats/default.nix
··· 5 5 libjxl, 6 6 libavif, 7 7 libraw, 8 - openexr_3, 8 + openexr, 9 9 }: 10 10 mkKdeDerivation { 11 11 pname = "kimageformats"; ··· 17 17 libjxl 18 18 libavif 19 19 libraw 20 - openexr_3 20 + openexr 21 21 ]; 22 22 }
+2 -2
pkgs/kde/gear/kio-extras/default.nix
··· 9 9 libimobiledevice, 10 10 gperf, 11 11 libtirpc, 12 - openexr_3, 12 + openexr, 13 13 taglib, 14 14 shared-mime-info, 15 15 libappimage, ··· 34 34 libimobiledevice 35 35 gperf 36 36 libtirpc 37 - openexr_3 37 + openexr 38 38 taglib 39 39 libappimage 40 40 xorg.libXcursor
+2 -2
pkgs/kde/misc/kio-extras-kf5/default.nix
··· 10 10 libimobiledevice, 11 11 gperf, 12 12 libtirpc, 13 - openexr_3, 13 + openexr, 14 14 taglib, 15 15 libappimage, 16 16 }: ··· 58 58 libimobiledevice 59 59 gperf 60 60 libtirpc 61 - openexr_3 61 + openexr 62 62 taglib 63 63 libappimage 64 64 ];
+1
pkgs/top-level/aliases.nix
··· 1269 1269 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 1270 1270 openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 1271 1271 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 1272 + openexr_3 = openexr; # Added 2025-03-12 1272 1273 openimageio2 = openimageio; # Added 2023-01-05 1273 1274 openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 1274 1275 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
+14 -17
pkgs/top-level/all-packages.nix
··· 361 361 362 362 copilot-language-server-fhs = copilot-language-server.fhs; 363 363 364 - curv = callPackage ../by-name/cu/curv/package.nix { 365 - openexr = openexr_3; 366 - }; 367 - 368 364 databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { }; 369 365 370 366 deck = callPackage ../by-name/de/deck/package.nix { ··· 4740 4736 libclang = llvmPackages_15.libclang; 4741 4737 clang = clang_15; 4742 4738 llvm = llvm_15; 4743 - openexr = openexr_3; 4744 4739 }; 4745 4740 4746 4741 ossec-agent = callPackage ../tools/security/ossec/agent.nix { }; ··· 9359 9354 fplll = callPackage ../development/libraries/fplll { }; 9360 9355 fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; 9361 9356 9357 + freeimage = callPackage ../by-name/fr/freeimage/package.nix { 9358 + openexr = openexr_2; 9359 + }; 9360 + 9362 9361 freeipa = callPackage ../os-specific/linux/freeipa { 9363 9362 # NOTE: freeipa and sssd need to be built with the same version of python 9364 9363 kerberos = krb5.override { ··· 9402 9401 9403 9402 gegl = callPackage ../development/libraries/gegl { 9404 9403 inherit (darwin.apple_sdk.frameworks) OpenCL; 9404 + openexr = openexr_2; 9405 9405 }; 9406 9406 9407 9407 gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { }; ··· 10790 10790 # TODO: LTO does not work. 10791 10791 # https://github.com/NixOS/nixpkgs/issues/343123 10792 10792 enableLto = false; 10793 + openexr = openexr_2; 10793 10794 }; 10794 10795 10795 10796 opencv4WithoutCuda = opencv4.override { ··· 10798 10799 10799 10800 opencv = opencv4; 10800 10801 10801 - openexr = openexr_2; 10802 - openexr_2 = callPackage ../development/libraries/openexr { }; 10803 - openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; 10802 + openexr = callPackage ../development/libraries/openexr/3.nix { }; 10803 + openexr_2 = callPackage ../development/libraries/openexr/2.nix { }; 10804 10804 10805 10805 opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { 10806 10806 inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; ··· 11439 11439 11440 11440 vigra = callPackage ../development/libraries/vigra { 11441 11441 hdf5 = hdf5.override { usev110Api = true; }; 11442 - openexr = openexr_3; 11443 11442 }; 11444 11443 11445 11444 vllm = with python3Packages; toPythonApplication vllm; ··· 13802 13801 13803 13802 airwave = libsForQt5.callPackage ../applications/audio/airwave { }; 13804 13803 13805 - alembic = callPackage ../development/libraries/alembic { 13806 - openexr = openexr_3; 13807 - }; 13804 + alembic = callPackage ../development/libraries/alembic { }; 13808 13805 13809 13806 amarok = libsForQt5.callPackage ../applications/audio/amarok { }; 13810 13807 amarok-kf5 = amarok; # for compatibility ··· 13903 13900 }; 13904 13901 13905 13902 blender = callPackage ../by-name/bl/blender/package.nix { 13906 - openexr = openexr_3; 13907 13903 python3Packages = python311Packages; 13908 13904 inherit (darwin.apple_sdk.frameworks) 13909 13905 Cocoa ··· 14091 14087 direwolf = callPackage ../applications/radio/direwolf { 14092 14088 hamlib = hamlib_4; 14093 14089 }; 14090 + 14091 + djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; 14094 14092 14095 14093 djview = libsForQt5.callPackage ../applications/graphics/djview { }; 14096 14094 djview4 = djview; ··· 14730 14728 14731 14729 hugin = callPackage ../applications/graphics/hugin { 14732 14730 wxGTK = wxGTK32; 14733 - openexr = openexr_3; 14734 14731 }; 14735 14732 14736 14733 huggle = libsForQt5.callPackage ../applications/misc/huggle { }; ··· 14939 14936 imagemagick = lowPrio ( 14940 14937 callPackage ../applications/graphics/ImageMagick { 14941 14938 inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; 14942 - openexr = openexr_3; 14943 14939 } 14944 14940 ); 14945 14941 ··· 15257 15253 portaudio = null; 15258 15254 }; 15259 15255 15260 - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; 15256 + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { 15257 + openexr = openexr_2; 15258 + }; 15261 15259 15262 15260 luddite = with python3Packages; toPythonApplication luddite; 15263 15261 ··· 15693 15691 }; 15694 15692 15695 15693 openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { 15696 - openexr = openexr_3; 15697 15694 }; 15698 15695 15699 15696 open-music-kontrollers = lib.recurseIntoAttrs {