nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-10 06:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #313900 from doronbehar/pkg/scipy

Browse Source 
python312Packages.scipy: 1.13.0 -> 1.13.1
This commit is contained in:
Doron Behar 2024-05-26 14:29:59 +03:00 committed by GitHub
commit c57b18c576
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/scipy/default.nix
View File

@ -38,8 +38,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.13.0";
srcHash = "sha256-HaYk92hOREHMOXppK+Bs9DrBu9KUVUsZ0KV+isTofUo=";
version = "1.13.1";
srcHash = "sha256-KpTvBJhiJ/IBjIFQhvS+NhRP3tbyXU5gQnAiFv47sKU=";
datasetsHashes = {
ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";
@ -80,12 +80,6 @@ buildPythonPackage {
hash = "sha256-Vf6/hhwu6X5s8KWhq8bUZKtSkdVu/GtEpGtj8Olxe7s=";
excludes = [ "doc/source/dev/contributor/meson_advanced.rst" ];
})
# Fix for https://github.com/scipy/scipy/issues/20300 until 1.13.1 is
# released. Patch is based upon:
# https://github.com/scipy/pocketfft/commit/9367142748fcc9696a1c9e5a99b76ed9897c9daa
# Couldn't use fetchpatch because it is a submodule of scipy, and
# extraPrefix doesn't fit this purpose.
./pocketfft-aligned_alloc.patch
];
# Upstream says in a comment in their pyproject.toml that building against

30
pkgs/development/python-modules/scipy/pocketfft-aligned_alloc.patch
View File

@ -1,30 +0,0 @@
From fbe3c10d117de98d80a86a10f76d4cd74efc55a8 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 22 Mar 2024 10:53:05 +0100
Subject: [PATCH] unconditionaly disable use of aligned_alloc
---
pocketfft_hdronly.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scipy/_lib/pocketfft/pocketfft_hdronly.h b/scipy/_lib/pocketfft/pocketfft_hdronly.h
index 6c98f2d..66eea06 100644
--- a/scipy/_lib/pocketfft/pocketfft_hdronly.h
+++ b/scipy/_lib/pocketfft/pocketfft_hdronly.h
@@ -152,11 +152,11 @@ template<> struct VLEN<double> { static constexpr size_t val=2; };
#endif
#endif
-// the __MINGW32__ part in the conditional below works around the problem that
-// the standard C++ library on Windows does not provide aligned_alloc() even
-// though the MinGW compiler and MSVC may advertise C++17 compliance.
-// aligned_alloc is only supported from MacOS 10.15.
-#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15)
+// std::aligned_alloc is a bit cursed ... it doesn't exist on MacOS < 10.15
+// and in musl, and other OSes seem to have even more peculiarities.
+// Let's unconditionally work around it for now.
+# if 0
+//#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15)
inline void *aligned_alloc(size_t align, size_t size)
{
// aligned_alloc() requires that the requested size is a multiple of "align"