From 1cf3c6b671e5ee3fc0f4b031199c1410afb00e39 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 17:05:23 +0200 Subject: [PATCH 1/4] fatrop: 0.0.1 -> 0.0.3 Diff: https://github.com/meco-group/fatrop/compare/v0.0.1...0.0.3 --- pkgs/by-name/fa/fatrop/package.nix | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index e85eede1e2d9..bbdaf74fe1b7 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -2,6 +2,7 @@ blasfeo, cmake, fetchFromGitHub, + fetchpatch, lib, llvmPackages, python3Packages, @@ -11,25 +12,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-c4qYh8RutRsMIx3m0oxXy73fnLTBGVZ1QjFcLEJ413Y="; + hash = "sha256-vCGix3qYQR9bY9GoIyBMrTNvsMgt0h7TZUye6wlH9H8="; }; - postPatch = lib.optionalString pythonSupport '' - # avoid submodule - rmdir external/pybind11 - ln -s ${python3Packages.pybind11.src} external/pybind11 - - # install python module - echo "" >> 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 - ''; + patches = lib.optionals pythonSupport [ + # fix python packaging + # ref. https://github.com/meco-group/fatrop/pull/17 + # this was merged upstream and can be removed on next release + (fetchpatch { + url = "https://github.com/meco-group/fatrop/pull/17/commits/22e33c216e47df90dc060686d7d1806233642249.patch"; + hash = "sha256-0/uSHAXVzXVyR+kklQGvraLA6sJbHzUcAp3eEHQK068="; + }) + (fetchpatch { + url = "https://github.com/meco-group/fatrop/pull/17/commits/0c03fd9fec95de42976fed1770a15081d0874ee2.patch"; + hash = "sha256-FenQ05rqn9EbU0wDVQQ1OFxSXj1fL/rOFKOcP8t1NwY="; + }) + ]; nativeBuildInputs = [ cmake ]; buildInputs = From 697e301788c0d890324030880d1fc2f8b14bd3a8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 20:31:07 +0200 Subject: [PATCH 2/4] casadi: build with fatrop thanks @traversaro ! --- pkgs/by-name/ca/casadi/package.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 9c39449704df..385145be5883 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -47,30 +47,33 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Fix build with system spral + # This was merged upstream and can be removed on next release (fetchpatch { name = "add-FindSPRAL.cmake.patch"; url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch"; hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ="; }) + # Fix build with fatrop + # This was merged upstream and can be removed on next release + (fetchpatch { + url = "https://github.com/casadi/casadi/pull/3832/commits/4d4edb21521817fc980da5e570a607ad2f15aaa2.patch"; + hash = "sha256-ui8pMaBz848Yv5xNlruPp9IFUhc97ZgvXGXqpxJG1Es="; + }) ]; 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 \ - " Date: Fri, 20 Sep 2024 15:31:07 +0200 Subject: [PATCH 3/4] fatrop: 0.0.3 -> 0.0.4 --- pkgs/by-name/fa/fatrop/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index bbdaf74fe1b7..f3c4b8606dee 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -2,7 +2,6 @@ blasfeo, cmake, fetchFromGitHub, - fetchpatch, lib, llvmPackages, python3Packages, @@ -12,29 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-vCGix3qYQR9bY9GoIyBMrTNvsMgt0h7TZUye6wlH9H8="; + hash = "sha256-XVOS9L2vQeFkPXZieX1ZJiVagR0f2BtiRmSDPB9LQeI="; }; - patches = lib.optionals pythonSupport [ - # fix python packaging - # ref. https://github.com/meco-group/fatrop/pull/17 - # this was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/meco-group/fatrop/pull/17/commits/22e33c216e47df90dc060686d7d1806233642249.patch"; - hash = "sha256-0/uSHAXVzXVyR+kklQGvraLA6sJbHzUcAp3eEHQK068="; - }) - (fetchpatch { - url = "https://github.com/meco-group/fatrop/pull/17/commits/0c03fd9fec95de42976fed1770a15081d0874ee2.patch"; - hash = "sha256-FenQ05rqn9EbU0wDVQQ1OFxSXj1fL/rOFKOcP8t1NwY="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ blasfeo ] From fd65959f5fc8d3f5b2beda543b0b3e9f9226521b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 1 Oct 2024 00:00:12 +0200 Subject: [PATCH 4/4] casadi: 3.6.6 -> 3.6.7 Diff: https://github.com/casadi/casadi/compare/3.6.6...3.6.7 --- pkgs/by-name/ca/casadi/package.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 385145be5883..cbae90c2dbe8 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,31 +36,15 @@ 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 = [ - # Fix build with system spral - # This was merged upstream and can be removed on next release - (fetchpatch { - name = "add-FindSPRAL.cmake.patch"; - url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch"; - hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ="; - }) - # Fix build with fatrop - # This was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/casadi/casadi/pull/3832/commits/4d4edb21521817fc980da5e570a607ad2f15aaa2.patch"; - hash = "sha256-ui8pMaBz848Yv5xNlruPp9IFUhc97ZgvXGXqpxJG1Es="; - }) - ]; - postPatch = '' # fix case of hpipmConfig.cmake