diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix index 12bdf9dfd719..034683d77361 100644 --- a/pkgs/by-name/fa/fatrop/package.nix +++ b/pkgs/by-name/fa/fatrop/package.nix @@ -1,46 +1,53 @@ { - blasfeo, - cmake, - fetchFromGitHub, lib, - llvmPackages, - python3Packages, - pythonSupport ? false, stdenv, + + fetchFromGitHub, + + cmake, + blasfeo, + llvmPackages, + gtest, + ctestCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "fatrop"; - version = "0.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "meco-group"; repo = "fatrop"; rev = "v${finalAttrs.version}"; - hash = "sha256-XVOS9L2vQeFkPXZieX1ZJiVagR0f2BtiRmSDPB9LQeI="; + hash = "sha256-WiIryO2bMtupJ2tvMY24Smrf86wgCNNxZbQJMn6ey/A="; }; 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; + 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"; - license = lib.licenses.lgpl3Only; + license = with lib.licenses; [ + bsd2 + epl20 + ]; maintainers = with lib.maintainers; [ nim65s ]; }; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f73cc21b7992..13f7492df9cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5528,13 +5528,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 { };