diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-24 21:17:58 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-24 21:17:58 +0200 |
| commit | 55258a5cb55da034d7d26e60e39b68e0eb74dafe (patch) | |
| tree | e2f1077c0b38588e15416db1640af93935f0701e | |
| parent | bc4ce318bf6aa52031ad891675c573ce31308c8d (diff) | |
| download | nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar.gz nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar.bz2 nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar.lz nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar.xz nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.tar.zst nixpkgs-55258a5cb55da034d7d26e60e39b68e0eb74dafe.zip | |
python310Packages.cvxpy: fix build on aarch64-darwin
| -rw-r--r-- | pkgs/development/python-modules/cvxpy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/osqp/default.nix | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 033af1fb5d9..da5f16d7f32 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -9,6 +9,7 @@ , osqp , scipy , scs +, setuptools , useOpenmp ? (!stdenv.isDarwin) # Check inputs , pytestCheckHook @@ -33,6 +34,7 @@ buildPythonPackage rec { osqp scipy scs + setuptools ]; # Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11 @@ -49,6 +51,8 @@ buildPythonPackage rec { disabledTests = [ "test_tv_inpainting" "test_diffcp_sdp_example" + "test_huber" + "test_partial_problem" ] ++ lib.optionals stdenv.isAarch64 [ "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155 ]; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 865bd45c61b..d85e6f4dc3b 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61"; }; + postPatch = '' + sed -i 's/sp.random/np.random/g' src/osqp/tests/*.py + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ cmake setuptools-scm ]; |