diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/python-modules/numpy/default.nix | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/numpy/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/numpy/default.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 68add2cdc26c..401a1120527a 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -1,6 +1,5 @@ { lib , fetchPypi -, fetchpatch , python , buildPythonPackage , gfortran @@ -11,7 +10,6 @@ , lapack , writeTextFile , cython -, setuptoolsBuildHook , pythonOlder }: @@ -41,19 +39,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - - # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so - # build both to verify they don't break. - # https://github.com/scipy/scipy/issues/15414 - version = "1.23.1"; - - format = "pyproject.toml"; + version = "1.24.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-10jvNJv+8uEZS1naN+1aKcGeqNfmNCAZkhuiuk/YtiQ="; + hash = "sha256-ADqfUw6IDLLNF3y6GvciC5qkLe+cSvwqL8Pua+frKyI="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -63,7 +56,7 @@ in buildPythonPackage rec { ./numpy-distutils-C++.patch ]; - nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; # we default openblas to build with 64 threads @@ -81,15 +74,16 @@ in buildPythonPackage rec { enableParallelBuilding = true; - checkInputs = [ + nativeCheckInputs = [ pytest - hypothesis + # "hypothesis" indirectly depends on numpy to build its documentation. + (hypothesis.override { enableDocumentation = false; }) typing-extensions ]; checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' popd runHook postCheck |