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.

Sign up for GitHub

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

Jump to bottom

singular: 3.1.7 -> 4.1.1 #38768

Merged
merged 1 commit into from Apr 12, 2018
Merged

singular: 3.1.7 -> 4.1.1 #38768

merged 1 commit into from Apr 12, 2018

Conversation

timokau
Copy link
Member

@timokau timokau commented Apr 11, 2018 •
edited

Motivation for this change
  • update singular
  • add factory and gfanlib support (apparently does not increase package size, although gfanlib does add one new (small) dependency)
  • add semi-optional dependencies suggested by upstream (ntl, flint)
  • copy into $out/lib instead of $out/LIB (which conflicts with $out/lib and results in weird nix~case~hack stuff when building remotely)
  • add a simple install check that starts singular and tries to load a package
  • adds mpfr as a propagated build input for flint (listed as a dependency at http://www.flintlib.org/ and flint.h imports mpfr.h)

Maintainer: @7c6f434c (who apparently is the maintainer for all the software I touch, sorry).

I still have to nox-review (nox-review wip doesn't work for some reason and I want to test on another PC than I developed on anyways, which is why I didn't do it before submitting the PR).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@7c6f434c
Copy link
Member

@timokau I think I have mentioned at some point that I have also tried to get a sane Sage build… I failed, but in the process I have added or significantly changed a ton of dependencies…

@timokau timokau mentioned this pull request Apr 11, 2018
Merged
8 tasks
7c6f434c
7c6f434c approved these changes Apr 11, 2018
View reviewed changes
Copy link
Member

@7c6f434c 7c6f434c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for the build success.

@timokau
Copy link
Member Author

timokau commented Apr 11, 2018 •
edited

libsingular fails, apparently there is no make target libsingular anymore. Upstream apparently removed every mention of it, https://github.com/Singular/Sources/blob/spielwiese/doc/HOWTO-libsingular now only instructs to make install (changed from install-libsingular in 4ed886341d5).

So I guess "regular" singular and libsingular are merged? I'm not sure what the difference was, do you know?

Edit: apparently nothing in nixpkgs depends on libsingular either

@timokau
Copy link
Member Author

timokau commented Apr 11, 2018

I think I have mentioned at some point that I have also tried to get a sane Sage build… I failed, but in the process I have added or significantly changed a ton of dependencies…

Makes sense.

Good news is that I actually have a sane sage running (and passing tests). Just some upstreaming and polishing to do.

@7c6f434c
Copy link
Member

libsingular was just for Sage, so if Sage now doesn't need it anymore…

It's good if you managed to make Sage work sanely.

@timokau
Copy link
Member Author

timokau commented Apr 11, 2018

I removed libsingular (and the pinning to gcc5). nox-review succeeds.

@ryantm
Copy link
Member

ryantm commented Apr 11, 2018

@GrahamcOfBorg eval

@7c6f434c 7c6f434c merged commit 783204b into NixOS:master Apr 12, 2018
@timokau timokau deleted the singular-4.1.1 branch April 12, 2018 11:45
@timokau timokau mentioned this pull request Apr 23, 2018
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c 7c6f434c approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@timokau @7c6f434c @ryantm @GrahamcOfBorg