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

maxima: add various fixes, re-add ecl support #38812

Merged
merged 1 commit into from Apr 12, 2018
Merged

Conversation

timokau
Copy link
Member

@timokau timokau commented Apr 11, 2018

Motivation for this change
  • re-add ecl support (there is one failing test, but it "basically works")
  • add varioius patches that fix unresolved upstream issues (see individual comments)
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.

# Failures in the regression test suite won't abort the build process. We run
# the suite only so that potential errors show up in the build log. See also:
# http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
doCheck = true;
doCheck = ecl == null; # one tests in rtest8 fails with ecl
Copy link
Member

Choose a reason for hiding this comment

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

Do you think disabling a single test is a bad idea? Comments can fall out of sync easier than code…

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried to find the number of the failing test but for some reason couldn't reproduce the failure at all, so now I just enable tests unconditionally.

@7c6f434c
Copy link
Member

cc @peti

@@ -11,15 +11,17 @@ let
(stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
in
stdenv.mkDerivation ({
inherit version;
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure what that version attribute is for. Nix doesn't use it, and the derivation doesn't reference it either, so this seems superfluous.

Copy link
Member Author

Choose a reason for hiding this comment

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

I use it in another package to locate the fas file:

MAXIMA_FAS="${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas";

Also I think its a nice de-facto standard to seperate version and name metadata, even if nix doesn't use it.

Copy link
Member

Choose a reason for hiding this comment

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

Nix does have a builtin derivation name parser that allows to separate version from the name, and some people think that using it provide better guarantees of consistency with command-line profile management tools.

I would actually prefer having a separate notion of version, but right now there is definitely no consensus in favour of it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Is there any disadvantage to having the version field exposed? In my opinion its cleaner than first putting it together in the name field and then parsing it again, but even if it isn't cleaner there is no harm right?

Copy link
Member

Choose a reason for hiding this comment

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

Isn't maxima/${maxima-ecl.version} the same thing as ${maxima-ecl.name}? I don't see why that construct requires a separate version attribute.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, crap, now I see it. Sorry, I wasn't thinking straight there for a second.

Copy link
Member

Choose a reason for hiding this comment

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

Not precisely the same: / vs -

@peti peti merged commit 722d822 into NixOS:master Apr 12, 2018
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.

None yet

4 participants