Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sage: import 10.2.beta3 patches #278257

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Conversation

nevivurn
Copy link
Member

@nevivurn nevivurn commented Jan 2, 2024

Description of changes

  • Import upstream patches:

  • Failing Hydra logs, relevant lines:

    [311/552] gcc -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -I/nix/store/jh2dj172jmmlw74kw4bsqa5ycf1blv4v-libxcrypt-4.4.36/include -fPIC -Isage/libs -I/nix/store/kiw2pplx7iadra2zy0c204bhngrjw8xg-gmp-with-cxx-6.3.0-dev/include -I/nix/store/jjxwn04kkwqy4nmdzp4np2pdjq21vhzv-ecl-23.9.9/include -I./sage/cpython -I/nix/store/0ikyy1lm97f36psav3pn2z1anglx678n-python3.11-cysignals-1.11.2/lib/python3.11/site-packages/cysignals -I/build/sage-src-10.0/pkgs/sagemath-standard -I/nix/store/2z836nvlwm17ih2sy1d1l165jihdr2ha-python3.11-numpy-1.26.1/lib/python3.11/site-packages/numpy/core/include -I/nix/store/5k91mg4qjylxbfvrv748smfh51ppjq0g-python3-3.11.6/include/python3.11 -Ibuild/cythonized -I/nix/store/5k91mg4qjylxbfvrv748smfh51ppjq0g-python3-3.11.6/include/python3.11 -c build/cythonized/sage/libs/ecl.c -o build/temp.linux-x86_64-cpython-311/build/cythonized/sage/libs/ecl.o -fno-strict-aliasing -DCYTHON_CLINE_IN_TRACEBACK=1 -Dlinux
    In file included from build/cythonized/sage/libs/ecl.c:3373:
    build/cythonized/sage/libs/eclsig.h: In function ‘ecl_bignum_from_mpz’:
    build/cythonized/sage/libs/eclsig.h:48:45: error: ‘struct ecl_bignum’ has no member named ‘big_num’
       48 | #define ecl_mpz_from_bignum(obj) ((obj)->big.big_num)
          |                                             ^
    build/cythonized/sage/libs/eclsig.h:53:13: note: in expansion of macro ‘ecl_mpz_from_bignum’
       53 |     mpz_set(ecl_mpz_from_bignum(z), num);
          |             ^~~~~~~~~~~~~~~~~~~
    build/cythonized/sage/libs/ecl.c: In function ‘__pyx_f_4sage_4libs_3ecl_ecl_to_python’:
    build/cythonized/sage/libs/eclsig.h:48:45: error: ‘struct ecl_bignum’ has no member named ‘big_num’
       48 | #define ecl_mpz_from_bignum(obj) ((obj)->big.big_num)
          |                                             ^
    build/cythonized/sage/libs/ecl.c:7415:199: note: in expansion of macro ‘ecl_mpz_from_bignum’
     7415 |     ((struct __pyx_vtabstruct_4sage_5rings_7integer_Integer *)__pyx_v_N->__pyx_base.__pyx_base.__pyx_base.__pyx_base.__pyx_base.__pyx_base.__pyx_base.__pyx_base.__pyx_vtab)->set_from_mpz(__pyx_v_N, ecl_mpz_from_bignum(__pyx_v_o));
          |                                                                                                                                                                                                       ^~~~~~~~~~~~~~~~~~~
    

Result of nixpkgs-review run on x86_64-linux 1

4 packages built:
  • cantor
  • labplot
  • sage
  • sageWithDoc

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

- fix for ecl >= 23.9.9
- fix for python >= 3.11
@nevivurn nevivurn changed the title sage: import ecl 23.9.9 upgrade patch sage: import 10.2.beta3 patches Jan 2, 2024
@nevivurn nevivurn marked this pull request as ready for review January 2, 2024 15:38
@nevivurn
Copy link
Member Author

nevivurn commented Jan 2, 2024

The x86_64-linux failure is due to a flaky test, known upstream (sagemath/sage#34772). Unsure what to do about it.

@nevivurn nevivurn requested a review from collares January 2, 2024 16:08
@collares
Copy link
Member

collares commented Jan 2, 2024

Great, thank you very much! No need to worry about the plot.py failure, I've seen it before too.

@collares collares merged commit 24954c2 into NixOS:master Jan 2, 2024
22 of 24 checks passed
@nevivurn nevivurn deleted the fix/sage-ecl branch January 2, 2024 16:37
@collares collares mentioned this pull request Jan 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants