diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 0f1f3e3d7a00..5cd35b064342 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -10,7 +10,6 @@ cplex, fatrop, fetchFromGitHub, - fetchpatch, gurobi, highs, hpipm, @@ -37,40 +36,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "casadi"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "casadi"; repo = "casadi"; rev = finalAttrs.version; - hash = "sha256-T4aaBS918NbUEwWkSx0URi0W9uhCB8IFmzRcOR7T8Og="; + hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; }; - patches = [ - (fetchpatch { - name = "add-FindSPRAL.cmake.patch"; - url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch"; - hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ="; - }) - ]; - postPatch = '' - # fix case of fatropConfig.cmake & hpipmConfig.cmake + # fix case of hpipmConfig.cmake substituteInPlace CMakeLists.txt --replace-fail \ "FATROP HPIPM" \ - "fatrop hpipm" + "FATROP hpipm" # nix provide lib/clang headers in libclang, not in llvm. substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \ '$'{CLANG_LLVM_LIB_DIR} \ ${llvmPackages_17.libclang.lib}/lib - # fix fatrop includes - substituteInPlace casadi/interfaces/fatrop/fatrop_conic_interface.hpp --replace-fail \ - "> fatropy/CMakeLists.txt - echo "install(DIRECTORY fatropy DESTINATION ${python3Packages.python.sitePackages})" >> fatropy/CMakeLists.txt - echo "install(TARGETS _fatropy DESTINATION ${python3Packages.python.sitePackages}/fatropy)" >> fatropy/CMakeLists.txt - ''; - nativeBuildInputs = [ cmake ]; buildInputs = [ blasfeo ]