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

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

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 @

@matthuszagh matthuszagh force-pushed the matthuszagh:asymptote-2.60 branch from 93eeb39 to b4ef360 Nov 15, 2019
@ofborg ofborg bot requested review from peti and 7c6f434c Nov 15, 2019
pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
autoconf
bison
flex
yacc
Comment on lines 28 to 31

This comment has been minimized.

@JohnAZoidberg

JohnAZoidberg Nov 16, 2019
Member

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.

rm *.tar.gz
configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
HOME=$TMP
./autogen.sh

This comment has been minimized.

@JohnAZoidberg

JohnAZoidberg Nov 16, 2019
Member

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

This comment has been minimized.

@matthuszagh

matthuszagh Nov 16, 2019
Author Contributor

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

configureFlags="$configureFlags \
--with-latex=$out/share/texmf/tex/latex \
--with-context=$out/share/texmf/tex/context/third"
'';
Comment on lines 48 to 50

This comment has been minimized.

@JohnAZoidberg

JohnAZoidberg Nov 16, 2019
Member

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"
+];
mkdir -p $out/share/emacs/site-lisp/${name}
mv $out/share/asymptote/*.el $out/share/emacs/site-lisp/${name}
Comment on lines 62 to 63

This comment has been minimized.

@JohnAZoidberg

JohnAZoidberg Nov 16, 2019
Member

Should be possible with install as a single command.

'';

enableParallelBuilding = true;

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

This comment has been minimized.

@JohnAZoidberg

JohnAZoidberg Nov 16, 2019
Member

Suggested change
version = "${version}";

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

@matthuszagh matthuszagh force-pushed the matthuszagh:asymptote-2.60 branch from b4ef360 to 2c40a74 Nov 16, 2019
@matthuszagh
Copy link
Contributor Author

@matthuszagh matthuszagh commented Nov 16, 2019

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

pkgs/tools/graphics/asymptote/default.nix Outdated Show resolved Hide resolved
Also cleans up some unnecessary steps in the build
expression.
@matthuszagh matthuszagh force-pushed the matthuszagh:asymptote-2.60 branch from 2c40a74 to 098a903 Nov 18, 2019
@JohnAZoidberg
Copy link
Member

@JohnAZoidberg JohnAZoidberg commented Nov 20, 2019

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
15 checks passed
15 checks passed
asymptote on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
asymptote on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@matthuszagh matthuszagh deleted the matthuszagh:asymptote-2.60 branch Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.