diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/python-modules/scipy/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/scipy/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/scipy/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 2c5ecd42585c..caca48153b72 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -13,7 +13,6 @@ , pkg-config , pythran , wheel -, nose , pytestCheckHook , pytest-xdist , numpy @@ -32,8 +31,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.3"; - srcHash = "sha256-swxRfFjTcKjKQv6GFdWNR6IKhdJQYhZSR7UWLtcnrXw="; + version = "1.11.4"; + srcHash = "sha256-hNAZOMDFYqZpb67Pzg/WALWagFYvqYO1jOmcipDDRbE="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -79,7 +78,7 @@ in buildPythonPackage { # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ - --replace 'meson-python>=0.12.1,<0.14.0' 'meson-python' \ + --replace 'meson-python>=0.12.1,<0.15.0' 'meson-python' \ --replace 'numpy==' 'numpy>=' \ --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ --replace 'wheel<0.41.0' 'wheel' @@ -109,7 +108,6 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - nose pytestCheckHook pytest-xdist ]; @@ -214,6 +212,7 @@ in buildPythonPackage { SCIPY_USE_G77_ABI_WRAPPER = 1; meta = with lib; { + changelog = "https://github.com/scipy/scipy/releases/tag/v${version}"; description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; |