python312Packages.xnd: cleanup, fix #400567
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: python
Member
|
Here it says updating cython alone is enough to fix this: aio-libs/aiohttp#7229. |
Contributor
Author
Adding |
github-actions
bot
added
10.rebuild-darwin: 1-10
Member
diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix
index d8580eeb4396..a7f57b44b3c0 100644
--- a/pkgs/development/python-modules/xnd/default.nix
+++ b/pkgs/development/python-modules/xnd/default.nix
@@ -7,6 +7,7 @@
ndtypes,
libndtypes,
python,
+ pythonAtLeast,
}:
buildPythonPackage {
@@ -20,18 +21,23 @@ buildPythonPackage {
buildInputs = [ libndtypes ];
- postPatch = ''
- substituteInPlace setup.py \
- --replace-fail \
- 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
- 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
- --replace-fail \
- 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
- 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
- --replace-fail \
- 'runtime_library_dirs = ["$ORIGIN"]' \
- 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]'
- '';
+ postPatch =
+ ''
+ substituteInPlace setup.py \
+ --replace-fail \
+ 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \
+ 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \
+ --replace-fail \
+ 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \
+ 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \
+ --replace-fail \
+ 'runtime_library_dirs = ["$ORIGIN"]' \
+ 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]'
+ ''
+ + lib.optionalString (pythonAtLeast "3.12") ''
+ substituteInPlace python/xnd/util.h \
+ --replace-fail '->ob_digit[i]' '->long_value.ob_digit[i]'
+ '';
postInstall =
''
@@ -52,9 +58,4 @@ buildPythonPackage {
runHook postCheck
'';
-
- meta = libxnd.meta // {
- # error: ‘PyLongObject’ {aka ‘struct _longobject’} has no member named ‘ob_digit’
- broken = true;
- };
} |
GaetanLepage
force-pushed
the
xnd
branch
2 times, most recently
from
6c615d4 to
5f466fb
Compare
Co-authored-by: Nick Cao <nickcao@nichi.co>
Contributor
Author
|
d
Nice! It works! |
GaetanLepage
changed the title
Contributor
Author
|
NickCao
approved these changes
Apr 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
cc @costrouc
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.