Unverified Commit bcba1b03 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #280682 from a-n-n-a-l-e-e/clarabel-init 

fix python3Packages.cvxpy build; add clarabel dependancy
parents eae668fa 652754ac

pkgs/development/python-modules/clarabel/Cargo.lock

0 → 100644
+1487 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/development/python-modules/clarabel/default.nix

0 → 100644
+62 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildPythonPackage

, fetchFromGitHub

, rustPlatform

, libiconv

, numpy

, scipy

}:



buildPythonPackage rec {

  pname = "clarabel";

  version = "0.6.0.post1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "oxfordcontrol";

    repo  = "Clarabel.rs";

    rev = "refs/tags/v${version}";

    hash = "sha256-5Mw+3WRMuz3BxLWRdsnXHjetsNrM3EZRZld8lVTNKgo=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

  };



  postPatch = ''

    ln -s ${./Cargo.lock} ./Cargo.lock

  '';



  nativeBuildInputs = with rustPlatform; [

    cargoSetupHook

    maturinBuildHook

  ];



  buildInputs = lib.optional stdenv.isDarwin libiconv;



  propagatedBuildInputs = [

    numpy

    scipy

  ];



  pythonImportsCheck = [

    "clarabel"

  ];



  # no tests but run the same examples as .github/workflows/pypi.yaml

  checkPhase = ''

    runHook preCheck

    python examples/python/example_sdp.py

    python examples/python/example_qp.py

    runHook postCheck

  '';



  meta = {

    changelog = "https://github.com/oxfordcontrol/Clarabel.rs/releases/tag/v${version}/CHANGELOG.md";

    description = "Conic Interior Point Solver";

    homepage = "https://github.com/oxfordcontrol/Clarabel.rs";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ a-n-n-a-l-e-e ];

  };

}

pkgs/development/python-modules/cvxpy/default.nix

+2 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildPythonPackage

, clarabel

, cvxopt

, ecos

, fetchPypi
@@ -40,6 +41,7 @@ buildPythonPackage rec { 
  ];



  propagatedBuildInputs = [

    clarabel

    cvxopt

    ecos

    numpy

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -2081,6 +2081,8 @@ self: super: with self; { 














  ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };



























  clarabel = callPackage ../development/python-modules/clarabel { };



























  clarifai = callPackage ../development/python-modules/clarifai { };





























  clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { };