From e7ea92f2c0d2dc6b7f6c63fc33b62749f6e7c2a9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 17 Oct 2024 08:49:09 +0200
Subject: [PATCH 1/2] Revert "openexr_3: 3.2.4 -> 3.3.0"

This reverts commit 6f7657be4c73074053d7ba31cd1b05e076190ef9.

Causes a libjxl test to fail.  Bisected to openexr commit
e4e6cf2 ("Initial conversion of input file to use core"), which
doesn't look like an intentional behavior change, so let's revert this
until that's figured out.  I've reported it to libjxl, and will report
it to openexr once they confirm it's not a problem on their end.

Link: https://github.com/libjxl/libjxl/issues/3901
---
 pkgs/development/libraries/openexr/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 44a50ba52c7c..56562f771698 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "3.3.0";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    hash = "sha256-/B0IMbPnixLR10KrE2n9n2Ny/pLIsG6DpBJn8Ax79oE=";
+    hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM=";
   };
 
   outputs = [ "bin" "dev" "out" "doc" ];

From bb9674228d0f13c1513ab3ca1b13230147085cfd Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 17 Oct 2024 08:51:34 +0200
Subject: [PATCH 2/2] openexr_3: add libjxl to tests

This would have caught the regression introduced by
6f7657be4c73 ("openexr_3: 3.2.4 -> 3.3.0"), and reverted in the parent
commit.
---
 pkgs/development/libraries/openexr/3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 56562f771698..65666cd7d6f2 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -5,6 +5,7 @@
 , imath
 , libdeflate
 , pkg-config
+, libjxl
 , pkgsCross
 }:
 
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.hostPlatform.isAarch32;
 
   passthru.tests = {
+    inherit libjxl;
     musl = pkgsCross.musl64.openexr_3;
   };