Unverified Commit 7660fe5c authored by Zexin Yuan's avatar Zexin Yuan
Browse files

osl: 1.13.11.0 -> 1.14.5.1

parent 22c320b5

pkgs/development/compilers/osl/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  bison,

  partio,

  pugixml,

  robin-map,

  util-linux,

  python3,

}:
@@ -24,13 +25,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "openshadinglanguage";

  version = "1.13.11.0";

  version = "1.14.5.1";



  src = fetchFromGitHub {

    owner = "AcademySoftwareFoundation";

    repo = "OpenShadingLanguage";

    rev = "v${version}";

    hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s=";

    hash = "sha256-dmGVCx4m2bkeKhAJbU1mrzEDAmnL++7GA5okb9wwk/Y=";

  };



  cmakeFlags = [
@@ -43,11 +44,13 @@ stdenv.mkDerivation rec { 
    "-DLLVM_DIRECTORY=${llvm}"

    "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"

    "-DLLVM_BC_GENERATOR=${clang}/bin/clang++"



    # Set C++11 to C++14 required for LLVM10+

    "-DCMAKE_CXX_STANDARD=14"

  ];



  prePatch = ''

    substituteInPlace src/cmake/modules/FindLLVM.cmake \

      --replace-fail "NO_DEFAULT_PATH" ""

  '';



  preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";



  nativeBuildInputs = [
@@ -67,6 +70,7 @@ stdenv.mkDerivation rec { 
      partio

      pugixml

      python3.pkgs.pybind11

      robin-map

      util-linux # needed just for hexdump

      zlib

    ]

pkgs/top-level/all-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -4098,9 +4098,9 @@ with pkgs; 
  };















  osl = libsForQt5.callPackage ../development/compilers/osl {













    libclang = llvmPackages_15.libclang;













    clang = clang_15;













    llvm = llvm_15;













    libclang = llvmPackages_19.libclang;













    clang = clang_19;













    llvm = llvm_19;















  };





























  ossec-agent = callPackage ../tools/security/ossec/agent.nix { };