materialx: 1.38.10 -> 1.39.3, openimageio_2: unpin and drop, robin-map: 1.3.0 -> 1.4.0 (#423590)

pkgs/applications/video/olive-editor/default.nix

@@ -30,6 +30,9 @@ let
         hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";
       }
     );
+
+    # robin-map headers require c++17
+    cmakeFlags = (old.cmakeFlags or [ ]) ++ [ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17") ];
   });
 in
 

pkgs/by-name/bl/blender/package.nix

@@ -58,7 +58,7 @@
   opencolorio,
   openexr,
   openimagedenoise,
-  openimageio_2,
+  openimageio,
   openjpeg,
   openpgl,
   opensubdiv,
@@ -250,7 +250,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (manifold.override { tbb_2021 = tbb; })
     opencolorio
     openexr
-    openimageio_2
+    openimageio
     openjpeg
     (openpgl.override { inherit tbb; })
     (opensubdiv.override { inherit cudaSupport; })

pkgs/by-name/gp/gpupad/package.nix

@@ -7,7 +7,7 @@
   glslang,
   imath,
   ktx-tools,
-  openimageio_2,
+  openimageio,
   qt6Packages,
   spdlog,
   spirv-cross,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     imath # needed for openimageio
     ktx-tools
-    openimageio_2
+    openimageio
     qt6Packages.qtbase
     qt6Packages.qtdeclarative
     qt6Packages.qtmultimedia

pkgs/by-name/op/openimageio/2.nix

@@ -1,15 +0,0 @@
-{ fetchFromGitHub, openimageio }:
-
-let
-  version = "2.5.17.0";
-in
-openimageio.overrideAttrs {
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "AcademySoftwareFoundation";
-    repo = "OpenImageIO";
-    tag = "v${version}";
-    hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU=";
-  };
-}

pkgs/by-name/ro/robin-map/package.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "robin-map";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "Tessil";
     repo = "robin-map";
     tag = "v${version}";
-    hash = "sha256-dspOWp/8oNR0p5XRnqO7WtPcCx54/y8m1cDho4UBYyc=";
+    hash = "sha256-Hkgxiq2i0TuqMK/bI5OMOn3LkmSE40NimDjK1FBZpsA=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/embree/2.x.nix

@@ -7,7 +7,7 @@
   ispc,
   tbb_2020,
   glfw,
-  openimageio_2,
+  openimageio,
   libjpeg,
   libpng,
   libpthreadstubs,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     # tbb_2021 is not backward compatible
     tbb_2020
     glfw
-    openimageio_2
+    openimageio
     libjpeg
     libpng
     libX11

pkgs/development/python-modules/materialx/default.nix

@@ -8,7 +8,7 @@
   libX11,
   libXt,
   libGL,
-  openimageio_2,
+  openimageio,
   imath,
   python,
   apple-sdk_14,
@@ -16,16 +16,13 @@
 
 buildPythonPackage rec {
   pname = "materialx";
-  version = "1.38.10";
+  version = "1.39.3";
 
-  # nixpkgs-update: no auto update
-  # Updates are disabled due to API breakage in 1.39+ that breaks almost all
-  # consumers.
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "MaterialX";
     rev = "v${version}";
-    hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo=";
+    hash = "sha256-ceVYD/dyb3SEEENoJZxjn94DGmUj6IYSNLjsJvmPM84=";
   };
 
   format = "other";
@@ -36,7 +33,7 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [
-    openimageio_2
+    openimageio
     imath
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -50,6 +47,7 @@ buildPythonPackage rec {
 
   cmakeFlags = [
     (lib.cmakeBool "MATERIALX_BUILD_OIIO" true)
+    (lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true)
     (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (
       stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin
@@ -66,12 +64,6 @@ buildPythonPackage rec {
     ln -s $out/python $target_dir
   '';
 
-  # Update to 1.39 has major API changes and downstream software
-  # needs to adapt, first. So, do not include in mass updates. For reference, see
-  # https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160
-  # and https://github.com/NixOS/nixpkgs/issues/380230
-  passthru.skipBulkUpdate = true;
-
   meta = {
     changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md";
     description = "Open standard for representing rich material and look-development content in computer graphics";

pkgs/top-level/all-packages.nix

@@ -13335,8 +13335,6 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  openimageio_2 = callPackage ../by-name/op/openimageio/2.nix { };
-
   open-music-kontrollers = lib.recurseIntoAttrs {
     eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
     jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };