Unverified Commit c197e917 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

parents 3f318505 41221c2f

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

+3 −0
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{ 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

+2 −2
Original line number Diff line number Diff line
@@ -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 = [