mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
Merge pull request #268178 from a-n-n-a-l-e-e/scs-blas-lapack-fix
python311Packages.scs: fix build; 3.2.3 -> 3.2.4
This commit is contained in:
commit
3fe4f79906
@ -1225,6 +1225,11 @@
|
||||
githubId = 81317317;
|
||||
name = "Anna Aurora";
|
||||
};
|
||||
a-n-n-a-l-e-e = {
|
||||
github = "a-n-n-a-l-e-e";
|
||||
githubId = 150648636;
|
||||
name = "annalee";
|
||||
};
|
||||
anoa = {
|
||||
matrix = "@andrewm:amorgan.xyz";
|
||||
email = "andrew@amorgan.xyz";
|
||||
|
@ -2,6 +2,10 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson-python
|
||||
, pkg-config
|
||||
, Accelerate
|
||||
, blas
|
||||
, lapack
|
||||
, numpy
|
||||
@ -12,19 +16,43 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scs";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bodono";
|
||||
repo = "scs-python";
|
||||
rev = version;
|
||||
hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM=";
|
||||
hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
lapack
|
||||
patches = [
|
||||
# needed for building against netlib's reference blas implementation and
|
||||
# the pkg-config patch. remove on next update
|
||||
(fetchpatch {
|
||||
name = "find-and-ld-lapack.patch";
|
||||
url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch";
|
||||
hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg=";
|
||||
})
|
||||
# add support for pkg-config. remove on next update
|
||||
(fetchpatch {
|
||||
name = "use-pkg-config.patch";
|
||||
url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch";
|
||||
hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson-python
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = if stdenv.isDarwin then [
|
||||
Accelerate
|
||||
] else [
|
||||
blas
|
||||
lapack
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -51,6 +79,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/cvxgrp/scs"; # upstream C package
|
||||
downloadPage = "https://github.com/bodono/scs-python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
maintainers = with maintainers; [ a-n-n-a-l-e-e drewrisinger ];
|
||||
};
|
||||
}
|
||||
|
@ -12683,7 +12683,9 @@ self: super: with self; {
|
||||
|
||||
scikit-survival = callPackage ../development/python-modules/scikit-survival { };
|
||||
|
||||
scs = callPackage ../development/python-modules/scs { };
|
||||
scs = callPackage ../development/python-modules/scs {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate;
|
||||
};
|
||||
|
||||
sdds = callPackage ../development/python-modules/sdds { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user