Unverified Commit 6f33da8a authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

openvino: 2025.2.1 -> 2025.4.2 (#486101)

parents a71b7824 a68aae00

pkgs/by-name/op/openvino/package.nix

+5 −20
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
let

  inherit (lib)

    cmakeBool

    getLib

    ;



  # prevent scons from leaking in the default python version
@@ -56,28 +57,16 @@ in 


stdenv.mkDerivation rec {

  pname = "openvino";

  version = "2025.2.1";

  version = "2025.4.2";



  src = fetchFromGitHub {

    owner = "openvinotoolkit";

    repo = "openvino";

    tag = version;

    fetchSubmodules = true;

    hash = "sha256-Bu0m7nGqyHwHsa7FKr4nvUh/poJxMTgwuAU81QBmI4g=";

    hash = "sha256-DDzY3o3ehYf/JYxh3AK25z1/UcuDrbQpaYFRWxPvpmk=";

  };



  patches = [

    (fetchpatch {

      name = "cmake4-compat.patch";

      url = "https://github.com/openvinotoolkit/openvino/commit/677716c2471cadf1bf1268eca6343498a886a229.patch?full_index=1";

      hash = "sha256-iaifJBdl7+tQZq1d8SiczUaXz+AdfMrLtwzfTmSG+XA=";

    })

    (fetchpatch {

      url = "https://github.com/openvinotoolkit/openvino/commit/564d2d6b9ca179004d32b70466dbd088eef8a307.patch?full_index=1";

      hash = "sha256-2khosDwlV7Dwxu0dvyDuCbo/XzR/eeYRGhlSieOfrFQ=";

    })

  ];



  outputs = [

    "out"

    "python"
@@ -107,8 +96,8 @@ stdenv.mkDerivation rec { 
    "-Wno-dev"

    "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake"

    "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}"

    "-DOpenCV_DIR=${lib.getLib opencv}/lib/cmake/opencv4/"

    "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"

    "-DOpenCV_DIR=${getLib opencv}/lib/cmake/opencv4/"

    "-DProtobuf_LIBRARIES=${getLib protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"

    "-DPython_EXECUTABLE=${python.interpreter}"



    (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
@@ -138,10 +127,6 @@ stdenv.mkDerivation rec { 
    (cmakeBool "ENABLE_SYSTEM_TBB" true)

  ];



  autoPatchelfIgnoreMissingDeps = [

    "libngraph_backend.so"

  ];



  # src/graph/src/plugins/intel_gpu/src/graph/include/reorder_inst.h:24:8: error: type 'struct typed_program_node' violates the C++ One Definition Rule [-Werror=odr]

  env.NIX_CFLAGS_COMPILE = "-Wno-odr";