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

Jump to bottom

asymptote: 2.47 -> 2.60 #73474

Merged
merged 1 commit into from Nov 20, 2019
Merged

asymptote: 2.47 -> 2.60 #73474

merged 1 commit into from Nov 20, 2019

Conversation

matthuszagh
Copy link
Contributor

@matthuszagh matthuszagh commented Nov 15, 2019 •
edited

Motivation for this change

Among other things, v2.6 improves usability for luatex users.

Things done

I've bumped asymptote to version 2.60. I've also removed some parts of the build expression that are no longer necessary and reorganized some other parts.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot requested review from peti and 7c6f434c November 15, 2019 22:11
JohnAZoidberg
JohnAZoidberg requested changes Nov 16, 2019
View reviewed changes
pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
pkgs/tools/graphics/asymptote/default.nix Outdated
Comment on lines 28 to 31
autoconf
bison
flex
yacc
Copy link
Member

Choose a reason for hiding this comment

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

try adding autoreconfHook to nativeBuildInputs instead. All non-runtime dependencies should go there.
Is tex required at runtime or does it only build the docs? Then move it to nativeBuildInputs, too.

pkgs/tools/graphics/asymptote/default.nix Show resolved Hide resolved
pkgs/tools/graphics/asymptote/default.nix Outdated
rm *.tar.gz
configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
HOME=$TMP
./autogen.sh
Copy link
Member

Choose a reason for hiding this comment

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

With autoreconfHook you'll be able to get rid of this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removing HOME=$TMP emits a bunch issues related to homeless-shelter so I've kept that in.

pkgs/tools/graphics/asymptote/default.nix Outdated
Comment on lines 48 to 50
configureFlags="$configureFlags \
--with-latex=$out/share/texmf/tex/latex \
--with-context=$out/share/texmf/tex/context/third"
'';
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion

-    configureFlags="$configureFlags \
-      --with-latex=$out/share/texmf/tex/latex \
-      --with-context=$out/share/texmf/tex/context/third"
-  '';
+'';

+configureFlags = [
+  "--with-latex=$out/share/texmf/tex/latex"
+  "--with-context=$out/share/texmf/tex/context/third"
+];

pkgs/tools/graphics/asymptote/default.nix Outdated
Comment on lines 62 to 63
mkdir -p $out/share/emacs/site-lisp/${name}
mv $out/share/asymptote/*.el $out/share/emacs/site-lisp/${name}
Copy link
Member

Choose a reason for hiding this comment

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

Should be possible with install as a single command.

pkgs/tools/graphics/asymptote/default.nix Outdated
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
inherit (s) version;
version = "${version}";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
version = "${version}";

Not really needed, not sure why it was there before.

@matthuszagh
Copy link
Contributor Author

@JohnAZoidberg thanks for the very helpful review! I've made most of the changes and included a few comments next to your suggestions.

ryantm
ryantm requested changes Nov 17, 2019
View reviewed changes
pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
@matthuszagh
asymptote: 2.47 -> 2.60
098a903 
Also cleans up some unnecessary steps in the build
expression.
@JohnAZoidberg
Copy link
Member

Builds an runs at least the help command fine, which opens the PDF help document.
Approval by maintainer @7c6f434c.

@JohnAZoidberg JohnAZoidberg merged commit d901b2a into NixOS:master Nov 20, 2019
@matthuszagh matthuszagh deleted the asymptote-2.60 branch November 20, 2019 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryantm ryantm ryantm requested changes

@JohnAZoidberg JohnAZoidberg JohnAZoidberg requested changes

@7c6f434c 7c6f434c 7c6f434c approved these changes

@peti peti Awaiting requested review from peti

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 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
@matthuszagh @JohnAZoidberg @ryantm @7c6f434c