diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/openexr | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/openexr')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openexr/3.nix | 9 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch | 16 |
2 files changed, 15 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/openexr/3.nix b/nixpkgs/pkgs/development/libraries/openexr/3.nix index a59c9795b223..074fdf4222d3 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -5,17 +5,18 @@ , imath , libdeflate , pkg-config +, pkgsCross }: stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-7KBjZpImSaW4GiK0ZCpMcjBPQ9aMmN5LW+/m6lkGK68="; + hash = "sha256-mVUxxYe6teiJ18PQ9703/kjBpJ9+a7vcDme+NwtQQQM="; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 doCheck = !stdenv.isAarch32; + passthru.tests = { + musl = pkgsCross.musl64.openexr_3; + }; + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com"; diff --git a/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch b/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch index f8fff65aceb4..f1ceb13d3a01 100644 --- a/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch +++ b/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch @@ -1,13 +1,13 @@ diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 44d9185d..8ffcd2b2 100644 +index 25f429da..918f56e9 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt -@@ -4,7 +4,7 @@ - # We require this to get object library link library support and +@@ -5,7 +5,7 @@ # combined python 2 + 3 support --add_subdirectory(IexTest) -+#add_subdirectory(IexTest) - add_subdirectory(OpenEXRCoreTest) - add_subdirectory(OpenEXRTest) - add_subdirectory(OpenEXRUtilTest) + if (OPENEXR_TEST_LIBRARIES) +- add_subdirectory(IexTest) ++ #add_subdirectory(IexTest) + add_subdirectory(OpenEXRCoreTest) + add_subdirectory(OpenEXRTest) + add_subdirectory(OpenEXRUtilTest) |