From 2ddb856be5f6e35594f9c38e088e5ee559ca59d7 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Sun, 22 Dec 2024 17:41:30 +0100
Subject: [PATCH] openexr: switch default version to v3

---
 pkgs/applications/graphics/gimp/default.nix   |  4 +--
 pkgs/applications/graphics/krita/generic.nix  |  4 +--
 pkgs/applications/kde/kio-extras.nix          |  4 +--
 .../video/olive-editor/default.nix            |  4 +--
 pkgs/by-name/an/ansel/package.nix             |  4 +--
 pkgs/by-name/ar/art/package.nix               |  4 +--
 .../color-transformation-language/package.nix |  4 +--
 pkgs/by-name/da/darktable/package.nix         |  4 +--
 pkgs/by-name/il/ilmbase/package.nix           |  8 +++--
 pkgs/by-name/li/libjxl/package.nix            |  4 +--
 pkgs/by-name/sw/swayimg/package.nix           |  4 +--
 pkgs/by-name/vi/vips/package.nix              |  4 +--
 pkgs/development/libraries/gdal/default.nix   |  4 +--
 .../libraries/gstreamer/bad/default.nix       |  4 +--
 .../libraries/libdevil/default.nix            |  4 +--
 .../libraries/opencolorio/default.nix         |  4 +--
 .../libraries/openexr/{default.nix => 2.nix}  |  1 +
 pkgs/development/libraries/openexr/3.nix      |  2 +-
 .../libraries/openscenegraph/default.nix      |  4 +--
 pkgs/kde/frameworks/kimageformats/default.nix |  4 +--
 pkgs/kde/gear/kio-extras/default.nix          |  4 +--
 pkgs/kde/misc/kio-extras-kf5/default.nix      |  4 +--
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 31 +++++++++----------
 24 files changed, 60 insertions(+), 59 deletions(-)
 rename pkgs/development/libraries/openexr/{default.nix => 2.nix} (99%)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d2b2644a1709..e5e552f299f9 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -45,7 +45,7 @@
   libheif,
   libxslt,
   libgudev,
-  openexr_3,
+  openexr,
   desktopToDarwinBundle,
   AppKit,
   Cocoa,
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       poppler
       poppler_data
       libtiff
-      openexr_3
+      openexr
       libmng
       librsvg
       libwmf
diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix
index 989bdb6fb02e..9b008cfc5d78 100644
--- a/pkgs/applications/graphics/krita/generic.nix
+++ b/pkgs/applications/graphics/krita/generic.nix
@@ -30,7 +30,7 @@
   libkdcraw,
   lcms2,
   gsl,
-  openexr_3,
+  openexr,
   giflib,
   libjxl,
   mlt,
@@ -105,7 +105,7 @@ mkDerivation rec {
     fribidi
     lcms2
     gsl
-    openexr_3
+    openexr
     lager
     libaom
     libheif
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 91d80677bb16..918c74301ad5 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -24,7 +24,7 @@
   syntax-highlighting,
   libmtp,
   libssh,
-  openexr_3,
+  openexr,
   libtirpc,
   phonon,
   qtsvg,
@@ -71,7 +71,7 @@ mkDerivation {
     syntax-highlighting
     libmtp
     libssh
-    openexr_3
+    openexr
     libtirpc
     phonon
     qtsvg
diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index b0c39aa7b3b5..b3cd3512a74d 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -12,7 +12,7 @@
   cmake,
   wrapQtAppsHook,
   openimageio,
-  openexr_3,
+  openexr,
   portaudio,
   imath,
   qtwayland,
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     opencolorio
     openimageio'
     imath
-    openexr_3
+    openexr
     portaudio
     qtwayland
     qtmultimedia
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 1e01858c5097..8e7d7dc50645 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -15,7 +15,7 @@
   libxml2,
   cmake,
   exiftool,
-  openexr_3,
+  openexr,
   glib,
   python3Packages,
   perlPackages,
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     libxkbcommon
     libxslt
     libXtst
-    openexr_3
+    openexr
     openjpeg
     osm-gps-map
     pcre
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index c6ac2033d256..428aaf9d400e 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -32,7 +32,7 @@
   exiv2,
   exiftool,
   mimalloc,
-  openexr_3,
+  openexr,
   ilmbase,
   opencolorio,
   color-transformation-language,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     exiftool
     libcanberra-gtk3
     mimalloc
-    openexr_3
+    openexr
     ilmbase
     opencolorio
     color-transformation-language
diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix
index 7fe0b5c661be..1fd5403142c9 100644
--- a/pkgs/by-name/co/color-transformation-language/package.nix
+++ b/pkgs/by-name/co/color-transformation-language/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   ilmbase,
-  openexr_3,
+  openexr,
   libtiff,
   aces-container,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ilmbase
-    openexr_3
+    openexr
     libtiff
     aces-container
   ];
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index 56c0799783b3..c005a716ddaa 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -55,7 +55,7 @@
   libxslt,
   lua,
   util-linux,
-  openexr_3,
+  openexr,
   openjpeg,
   osm-gps-map,
   pcre2,
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
       libwebp
       libxslt
       lua
-      openexr_3
+      openexr
       openjpeg
       osm-gps-map
       pcre2
diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix
index 400eec45f1a8..ecca1b5159a5 100644
--- a/pkgs/by-name/il/ilmbase/package.nix
+++ b/pkgs/by-name/il/ilmbase/package.nix
@@ -3,16 +3,17 @@
   lib,
   buildPackages,
   cmake,
-  openexr,
+  # explicitely depending on openexr_2 because ilmbase doesn't exist for v3
+  openexr_2,
 }:
 
 stdenv.mkDerivation {
   pname = "ilmbase";
-  version = lib.getVersion openexr;
+  version = lib.getVersion openexr_2;
 
   # the project no longer provides separate tarballs. We may even want to merge
   # the ilmbase package into openexr in the future.
-  inherit (openexr) src patches;
+  inherit (openexr_2) src patches;
 
   outputs = [
     "out"
@@ -37,5 +38,6 @@ stdenv.mkDerivation {
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    insecure = true;
   };
 }
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index e9860f5867f2..0a91d21f128e 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -12,7 +12,7 @@
   libpng,
   libwebp,
   gdk-pixbuf,
-  openexr_3,
+  openexr,
   pkg-config,
   makeWrapper,
   zlib,
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     libpng
     libwebp
     gdk-pixbuf
-    openexr_3
+    openexr
     zlib
   ];
 
diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix
index 1420a6374fe0..369c7897ef7c 100644
--- a/pkgs/by-name/sw/swayimg/package.nix
+++ b/pkgs/by-name/sw/swayimg/package.nix
@@ -23,7 +23,7 @@
   libavif,
   libsixel,
   libraw,
-  openexr_3,
+  openexr,
   bash-completion,
   testers,
   nix-update-script,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     libavif
     libsixel
     libraw
-    openexr_3
+    openexr
   ];
 
   passthru = {
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index c76857b0a371..0c1785e560a6 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -38,7 +38,7 @@
   libtiff,
   libwebp,
   matio,
-  openexr_3,
+  openexr,
   openjpeg,
   openslide,
   pango,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       libtiff
       libwebp
       matio
-      openexr_3
+      openexr
       openjpeg
       openslide
       pango
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 86521085307a..f908456749ad 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -62,7 +62,7 @@
   libxml2,
   lz4,
   netcdf,
-  openexr_3,
+  openexr,
   openjpeg,
   openssl,
   pcre2,
@@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
       nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
           # tests for formats enabled by these packages fail on macos
-          openexr_3
+          openexr
           xercesc
         ]
         ++ arrowDeps
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index b6ad921a3768..fabdf20404ed 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -62,7 +62,7 @@
   libusb1,
   neon,
   openal,
-  openexr_3,
+  openexr,
   openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264,
   openh264,
   libopenmpt,
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
       libusb1
       neon
       openal
-      openexr_3
+      openexr
       rtmpdump
       pango
       soundtouch
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 997fb3025a03..e36402b68b5a 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -8,7 +8,7 @@
   libmng,
   lcms1,
   libtiff,
-  openexr_3,
+  openexr,
   libGL,
   libX11,
   pkg-config,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmng
       lcms1
       libtiff
-      openexr_3
+      openexr
     ]
     ++ lib.optionals withXorg [
       libX11
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 5b5a45b6c372..00e041aafb0a 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -22,7 +22,7 @@
   # Build apps
   buildApps ? true, # Utility applications
   lcms2,
-  openexr_3,
+  openexr,
 }:
 
 stdenv.mkDerivation rec {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals buildApps [
       lcms2
-      openexr_3
+      openexr
     ];
 
   cmakeFlags =
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/2.nix
similarity index 99%
rename from pkgs/development/libraries/openexr/default.nix
rename to pkgs/development/libraries/openexr/2.nix
index 84dc7fb990e7..7a71776aba89 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/2.nix
@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.openexr.com/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    insecure = true;
   };
 }
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index c52dac8dab25..dff5ba112bca 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     inherit libjxl;
-    musl = pkgsCross.musl64.openexr_3;
+    musl = pkgsCross.musl64.openexr;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index c28beee8645c..df568d649494 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -25,7 +25,7 @@
   jpegSupport ? true,
   libjpeg,
   exrSupport ? false,
-  openexr_3,
+  openexr,
   gifSupport ? true,
   giflib,
   pngSupport ? true,
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       zlib
     ]
     ++ lib.optional jpegSupport libjpeg
-    ++ lib.optional exrSupport openexr_3
+    ++ lib.optional exrSupport openexr
     ++ lib.optional gifSupport giflib
     ++ lib.optional pngSupport libpng
     ++ lib.optional tiffSupport libtiff
diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix
index 0b3d049dc185..71e6d884af98 100644
--- a/pkgs/kde/frameworks/kimageformats/default.nix
+++ b/pkgs/kde/frameworks/kimageformats/default.nix
@@ -5,7 +5,7 @@
   libjxl,
   libavif,
   libraw,
-  openexr_3,
+  openexr,
 }:
 mkKdeDerivation {
   pname = "kimageformats";
@@ -17,6 +17,6 @@ mkKdeDerivation {
     libjxl
     libavif
     libraw
-    openexr_3
+    openexr
   ];
 }
diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix
index 0e3702ce7360..2260feeac62c 100644
--- a/pkgs/kde/gear/kio-extras/default.nix
+++ b/pkgs/kde/gear/kio-extras/default.nix
@@ -9,7 +9,7 @@
   libimobiledevice,
   gperf,
   libtirpc,
-  openexr_3,
+  openexr,
   taglib,
   shared-mime-info,
   libappimage,
@@ -34,7 +34,7 @@ mkKdeDerivation {
     libimobiledevice
     gperf
     libtirpc
-    openexr_3
+    openexr
     taglib
     libappimage
     xorg.libXcursor
diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix
index add6b08de399..886ae1a62777 100644
--- a/pkgs/kde/misc/kio-extras-kf5/default.nix
+++ b/pkgs/kde/misc/kio-extras-kf5/default.nix
@@ -10,7 +10,7 @@
   libimobiledevice,
   gperf,
   libtirpc,
-  openexr_3,
+  openexr,
   taglib,
   libappimage,
 }:
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libimobiledevice
     gperf
     libtirpc
-    openexr_3
+    openexr
     taglib
     libappimage
   ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f218415ab6b6..14b051cd6e2b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1269,6 +1269,7 @@ mapAliases {
   opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
   openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13
+  openexr_3 = openexr; # Added 2025-03-12
   openimageio2 = openimageio; # Added 2023-01-05
   openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
   openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..40e3b1f4abdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -361,10 +361,6 @@ with pkgs;
 
   copilot-language-server-fhs = copilot-language-server.fhs;
 
-  curv = callPackage ../by-name/cu/curv/package.nix {
-    openexr = openexr_3;
-  };
-
   databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { };
 
   deck = callPackage ../by-name/de/deck/package.nix {
@@ -4740,7 +4736,6 @@ with pkgs;
     libclang = llvmPackages_15.libclang;
     clang = clang_15;
     llvm = llvm_15;
-    openexr = openexr_3;
   };
 
   ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
@@ -9358,6 +9353,10 @@ with pkgs;
   fplll = callPackage ../development/libraries/fplll { };
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
 
+  freeimage = callPackage ../by-name/fr/freeimage/package.nix {
+    openexr = openexr_2;
+  };
+
   freeipa = callPackage ../os-specific/linux/freeipa {
     # NOTE: freeipa and sssd need to be built with the same version of python
     kerberos = krb5.override {
@@ -9401,6 +9400,7 @@ with pkgs;
 
   gegl = callPackage ../development/libraries/gegl {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
+    openexr = openexr_2;
   };
 
   gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { };
@@ -10789,6 +10789,7 @@ with pkgs;
     # TODO: LTO does not work.
     # https://github.com/NixOS/nixpkgs/issues/343123
     enableLto = false;
+    openexr = openexr_2;
   };
 
   opencv4WithoutCuda = opencv4.override {
@@ -10797,9 +10798,8 @@ with pkgs;
 
   opencv = opencv4;
 
-  openexr = openexr_2;
-  openexr_2 = callPackage ../development/libraries/openexr { };
-  openexr_3 = callPackage ../development/libraries/openexr/3.nix { };
+  openexr = callPackage ../development/libraries/openexr/3.nix { };
+  openexr_2 = callPackage ../development/libraries/openexr/2.nix { };
 
   opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;
@@ -11438,7 +11438,6 @@ with pkgs;
 
   vigra = callPackage ../development/libraries/vigra {
     hdf5 = hdf5.override { usev110Api = true; };
-    openexr = openexr_3;
   };
 
   vllm = with python3Packages; toPythonApplication vllm;
@@ -13800,9 +13799,7 @@ with pkgs;
 
   airwave = libsForQt5.callPackage ../applications/audio/airwave { };
 
-  alembic = callPackage ../development/libraries/alembic {
-    openexr = openexr_3;
-  };
+  alembic = callPackage ../development/libraries/alembic { };
 
   amarok = libsForQt5.callPackage ../applications/audio/amarok { };
   amarok-kf5 = amarok; # for compatibility
@@ -13901,7 +13898,6 @@ with pkgs;
   };
 
   blender = callPackage ../by-name/bl/blender/package.nix {
-    openexr = openexr_3;
     python3Packages = python311Packages;
     inherit (darwin.apple_sdk.frameworks)
       Cocoa
@@ -14090,6 +14086,8 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
+  djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
+
   djview = libsForQt5.callPackage ../applications/graphics/djview { };
   djview4 = djview;
 
@@ -14728,7 +14726,6 @@ with pkgs;
 
   hugin = callPackage ../applications/graphics/hugin {
     wxGTK = wxGTK32;
-    openexr = openexr_3;
   };
 
   huggle = libsForQt5.callPackage ../applications/misc/huggle { };
@@ -14937,7 +14934,6 @@ with pkgs;
   imagemagick = lowPrio (
     callPackage ../applications/graphics/ImageMagick {
       inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
-      openexr = openexr_3;
     }
   );
 
@@ -15255,7 +15251,9 @@ with pkgs;
     portaudio = null;
   };
 
-  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr {
+    openexr = openexr_2;
+  };
 
   luddite = with python3Packages; toPythonApplication luddite;
 
@@ -15691,7 +15689,6 @@ with pkgs;
   };
 
   openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
-    openexr = openexr_3;
   };
 
   open-music-kontrollers = lib.recurseIntoAttrs {