fastcluster/ols: fix cross compilation to moby

This commit is contained in:
2024-06-20 13:33:18 +00:00
parent dab60e79c1
commit 65a0914828
2 changed files with 18 additions and 9 deletions

View File

@@ -30,6 +30,13 @@ in
# hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE="; # hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE=";
# }) # })
(fetchpatch' {
# xsimd is required by scipy, which is required by ols
title = "xsimd: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/321253";
hash = "sha256-0gC86tyoSEtpGBdz9ISc1WyCQm+ZM3epGzpK1PUNzCk=";
})
(fetchpatch' { (fetchpatch' {
title = "unl0kr: 2.0.0 -> 3.2.0"; title = "unl0kr: 2.0.0 -> 3.2.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/319126"; prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";

View File

@@ -1,13 +1,14 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, oldest-supported-numpy
, numpy , numpy
, scipy , setuptools
}: buildPythonPackage rec { }: buildPythonPackage rec {
pname = "mypackage"; pname = "fastcluster";
version = "1.2.6"; version = "1.2.6";
# format = "pyproject"; # but i'd have to substitute "oldest_supported_numpy" -> "numpy" format = "pyproject";
format = "setuptools"; # format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fastcluster"; owner = "fastcluster";
@@ -16,13 +17,14 @@
hash = "sha256-8FDipkAcOAI5zAC7JaJExe6HO1xHg+eXAL7IUIVrA3k="; hash = "sha256-8FDipkAcOAI5zAC7JaJExe6HO1xHg+eXAL7IUIVrA3k=";
}; };
propagatedBuildInputs = [ nativeBuildInputs = [
numpy oldest-supported-numpy
setuptools
]; ];
checkInputs = [ # propagatedBuildInputs = [
scipy # numpy
]; # ];
pythonImportsCheck = [ pythonImportsCheck = [
"fastcluster" "fastcluster"