From 55d00aa8e050c4d26b2d9e98b6811ded88366a47 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 16 Feb 2026 15:53:28 +0100 Subject: [PATCH 1/5] fatrop: 0.0.4 -> 1.0.0 --- pkgs/by-name/fa/fatrop/package.nix | 24 +++++++++++------------- pkgs/top-level/python-packages.nix | 7 ------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index 12bdf9dfd719..58f3b6bb9244 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -1,42 +1,40 @@ { - blasfeo, - cmake, - fetchFromGitHub, lib, - llvmPackages, - python3Packages, - pythonSupport ? false, stdenv, + + fetchFromGitHub, + + cmake, + blasfeo, + llvmPackages, + gtest, }: stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-XVOS9L2vQeFkPXZieX1ZJiVagR0f2BtiRmSDPB9LQeI="; + hash = "sha256-iPYNbDN/rqx33y4zPD49WpGG3CP78cPwRlWnfVRktKc="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ blasfeo ] - ++ lib.optionals pythonSupport [ python3Packages.pybind11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_DOCS" true) - (lib.cmakeBool "ENABLE_MULTITHREADING" true) (lib.cmakeBool "BUILD_WITH_BLASFEO" false) - (lib.cmakeBool "WITH_PYTHON" pythonSupport) - (lib.cmakeBool "WITH_SPECTOOL" false) # this depends on casadi ]; doCheck = true; + checkInputs = [ gtest ]; + meta = { description = "Nonlinear optimal control problem solver that aims to be fast, support a broad class of optimal control problems and achieve a high numerical robustness"; homepage = "https://github.com/meco-group/fatrop"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a84b34e2e7a..aaf2fbe92dfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5359,13 +5359,6 @@ self: super: with self; { fastuuid = callPackage ../development/python-modules/fastuuid { }; - fatrop = toPythonModule ( - pkgs.fatrop.override { - pythonSupport = true; - python3Packages = self; - } - ); - faust-cchardet = callPackage ../development/python-modules/faust-cchardet { }; fava = callPackage ../development/python-modules/fava { }; From 5e1fd13190c5f3ecd14593eb22840d04923aedcb Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 21 May 2026 09:36:56 +0200 Subject: [PATCH 2/5] fatrop: 1.0.0 -> 1.0.1.mod Diff: https://github.com/meco-group/fatrop/compare/v1.0.0...v1.0.1.mod --- pkgs/by-name/fa/fatrop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index 58f3b6bb9244..d9e8d2e94aa8 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "1.0.0"; + version = "1.0.1.mod"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-iPYNbDN/rqx33y4zPD49WpGG3CP78cPwRlWnfVRktKc="; + hash = "sha256-2exJa9pKISDnq1MFLDV5My09BYEEN09slCTPtogd/f8="; }; nativeBuildInputs = [ cmake ]; From 3695d1c87d7b4e17b62a59458405ca3c67b9e97c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 1 Jun 2026 10:32:26 +0200 Subject: [PATCH 3/5] fatrop: deactivate failing test on darwin --- pkgs/by-name/fa/fatrop/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index d9e8d2e94aa8..08a0a9ee4dec 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -8,6 +8,7 @@ blasfeo, llvmPackages, gtest, + ctestCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -33,8 +34,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + nativeCheckInputs = [ ctestCheckHook ]; checkInputs = [ gtest ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "LUFactorizationTest.transposedLUFactorization" + ]; + meta = { description = "Nonlinear optimal control problem solver that aims to be fast, support a broad class of optimal control problems and achieve a high numerical robustness"; homepage = "https://github.com/meco-group/fatrop"; From db670e41977c769259deb22ccf039073f95e11b3 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 1 Jun 2026 18:58:25 +0200 Subject: [PATCH 4/5] fatrop: 1.0.1.mod -> 1.1.0 Diff: https://github.com/meco-group/fatrop/compare/v1.0.1.mod...v1.1.0 --- pkgs/by-name/fa/fatrop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index 08a0a9ee4dec..29c19cc89822 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "1.0.1.mod"; + version = "1.1.0"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-2exJa9pKISDnq1MFLDV5My09BYEEN09slCTPtogd/f8="; + hash = "sha256-WiIryO2bMtupJ2tvMY24Smrf86wgCNNxZbQJMn6ey/A="; }; nativeBuildInputs = [ cmake ]; From dada8c9e081cf8c1f5b9c7db2869afe614f6df98 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 1 Jun 2026 19:00:20 +0200 Subject: [PATCH 5/5] fatrop: update license --- pkgs/by-name/fa/fatrop/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index 29c19cc89822..034683d77361 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Nonlinear optimal control problem solver that aims to be fast, support a broad class of optimal control problems and achieve a high numerical robustness"; homepage = "https://github.com/meco-group/fatrop"; - license = lib.licenses.lgpl3Only; + license = with lib.licenses; [ + bsd2 + epl20 + ]; maintainers = with lib.maintainers; [ nim65s ]; }; })