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

asciidoctor: 1.5.6.1 -> 1.5.6.2, also add mathematical and coderay #38640

Merged
merged 4 commits into from Apr 12, 2018
Merged

asciidoctor: 1.5.6.1 -> 1.5.6.2, also add mathematical and coderay #38640

merged 4 commits into from Apr 12, 2018

Conversation

expipiplus1
Copy link
Contributor

asciidoctor-mathematical requires a few system dependencies to compile,
and some of these are not linked correctly into the resulting shared
object, so these are handled manually.

asciidoctor-mathematical and coderay are necessary to compile the
vulkan specification documentation.

@expipiplus1
ruby bundlerApp: Allow passing gemConfig through to bundlerEnv
69017e4
@expipiplus1
asciidoctor: 1.5.6.1 -> 1.5.6.2, also add mathematical and coderay
16bc4ff 
`asciidoctor-mathematical` requires a few system dependencies to
compile, and some of these are not linked correctly into the resulting
shared object, so these are handled manually.

`asciidoctor-mathematical` and `coderay` are necessary to compile the
vulkan specification documentation.
@zimbatm
Copy link
Member

zimbatm commented Apr 9, 2018

@GrahamcOfBorg build asciidoctor

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: asciidoctor

Partial log (click to expand)

Successfully installed asciidoctor-mathematical-0.2.2
1 gem installed
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/h35pw8afvjb1bjwhdgp0rm7mwph8hah1-ruby2.4.3-asciidoctor-mathematical-0.2.2
patching script interpreter paths in /nix/store/h35pw8afvjb1bjwhdgp0rm7mwph8hah1-ruby2.4.3-asciidoctor-mathematical-0.2.2
checking for references to /build in /nix/store/h35pw8afvjb1bjwhdgp0rm7mwph8hah1-ruby2.4.3-asciidoctor-mathematical-0.2.2...
building '/nix/store/xr4avk6pfhfgg9qar3f8nrmrpfccjwwm-asciidoctor-1.5.6.2.drv'...
created 149 symlinks in user environment
building '/nix/store/j6n1slh33g4blqrss7hf7cf88akmzb80-asciidoctor-1.5.6.2.drv'...
/nix/store/vf4i7fipghlr2vkdlyw9jgirbhcifv4b-asciidoctor-1.5.6.2

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: asciidoctor

Partial log (click to expand)

/nix/store/3swahscf0r58635i8lq1hf8qx4w3y6hs-ruby2.4.3-mathematical-1.6.11/lib/ruby/gems/2.4.0/gems/mathematical-1.6.11/ext/mathematical/mtex2MML/script/cibuild: interpreter directive changed from "/bin/sh" to "/nix/store/x030a63qdilnv02pkivfjg44pdxsh5km-bash-4.4-p19/bin/sh"
/nix/store/3swahscf0r58635i8lq1hf8qx4w3y6hs-ruby2.4.3-mathematical-1.6.11/lib/ruby/gems/2.4.0/gems/mathematical-1.6.11/ext/mathematical/mtex2MML/script/bootstrap: interpreter directive changed from "/bin/bash" to "/nix/store/x030a63qdilnv02pkivfjg44pdxsh5km-bash-4.4-p19/bin/bash"
/nix/store/3swahscf0r58635i8lq1hf8qx4w3y6hs-ruby2.4.3-mathematical-1.6.11/lib/ruby/gems/2.4.0/gems/mathematical-1.6.11/ext/mathematical/mtex2MML/script/tag: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/5imx3hwwa78h4qfp9daiclpqp9lb2254-ruby-2.4.3/bin/ruby"
/nix/store/gv82dganjyq4mv42pxf0571g9b5azz31-stdenv-darwin/setup: line 108: patchelf: command not found
/nix/store/gv82dganjyq4mv42pxf0571g9b5azz31-stdenv-darwin/setup: line 108: patchelf: command not found
builder for '/nix/store/92d99lpg0gz7wsdx399vqvcqggv3csnf-ruby2.4.3-mathematical-1.6.11.drv' failed with exit code 127
cannot build derivation '/nix/store/2jphfb33m1s97xqjqvlcbi1k4fz5znzh-ruby2.4.3-asciidoctor-mathematical-0.2.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3q96zmc7nyz24wxby5ahbvd3gq1pqjsd-asciidoctor-1.5.6.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/p6h20ya9dv0mkbzq4yrymmdjdjvrzpq7-asciidoctor-1.5.6.2.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/p6h20ya9dv0mkbzq4yrymmdjdjvrzpq7-asciidoctor-1.5.6.2.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: asciidoctor

Partial log (click to expand)

Successfully installed asciidoctor-mathematical-0.2.2
1 gem installed
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1n3pwb291dl7d6p8y3vqa6krq4almq1v-ruby2.4.3-asciidoctor-mathematical-0.2.2
patching script interpreter paths in /nix/store/1n3pwb291dl7d6p8y3vqa6krq4almq1v-ruby2.4.3-asciidoctor-mathematical-0.2.2
checking for references to /build in /nix/store/1n3pwb291dl7d6p8y3vqa6krq4almq1v-ruby2.4.3-asciidoctor-mathematical-0.2.2...
building '/nix/store/i1c2sh76rsyj8byjxc6y8q5qm9pvzpds-asciidoctor-1.5.6.2.drv'...
created 149 symlinks in user environment
building '/nix/store/javmkr59hxsmjlj4sxysgqb4i1f7ji17-asciidoctor-1.5.6.2.drv'...
/nix/store/5jm3dyc6lj8zym8iacbfjh120bxnzrwx-asciidoctor-1.5.6.2

@zimbatm
Copy link
Member

zimbatm commented Apr 9, 2018

@expipiplus1 can you fix the build for Darwin? no objection on the other changes.

@expipiplus1
Copy link
Contributor Author

No problem, looks like a missing dependency on patchelf

@expipiplus1
asciidoctor: Use an explicit path to patchelf
cb3f5a2 
Hopefully fixing the Darwin build
@expipiplus1
Copy link
Contributor Author

@GrahamcOfBorg build asciidoctor on Darwin

@expipiplus1
Copy link
Contributor Author

@GrahamcOfBorg build asciidoctor

@zimbatm
Copy link
Member

zimbatm commented Apr 12, 2018

@expipiplus1 what happens if patchelf is missing, is asciidoctor still working unless that extension is being used?

Darwin uses Mach-O instead of ELF for executables so you could try postFixup = lib.optionalString isLinux "..."

@expipiplus1
Copy link
Contributor Author

@zimbatm as long as one doesn't use the asciidoctor-mathematical plugin the it all works correctly. I think patching on Linux for now is fine, it's not any worse on OS X than before in terms of functionality.

@expipiplus1
Copy link
Contributor Author

Done

@zimbatm
Copy link
Member

zimbatm commented Apr 12, 2018

@GrahamcOfBorg build asciidoctor

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: asciidoctor

Partial log (click to expand)

  Bin dir: /nix/store/1yz4x1bl7pdp902pq25lajpklwkd4rkj-ruby2.4.3-asciidoctor-mathematical-0.2.2/lib/ruby/gems/2.4.0/bin
  Gem home: /nix/store/1yz4x1bl7pdp902pq25lajpklwkd4rkj-ruby2.4.3-asciidoctor-mathematical-0.2.2/lib/ruby/gems/2.4.0
Successfully installed asciidoctor-mathematical-0.2.2
1 gem installed
post-installation fixup
patching script interpreter paths in /nix/store/1yz4x1bl7pdp902pq25lajpklwkd4rkj-ruby2.4.3-asciidoctor-mathematical-0.2.2
building '/nix/store/0c0zsyf5alv34wg393nb4kk636jgwz8s-asciidoctor-1.5.6.2.drv'...
created 149 symlinks in user environment
building '/nix/store/7pbx86081246x855h1avkdl0vpkisns1-asciidoctor-1.5.6.2.drv'...
/nix/store/g281nq81msvpgwrhrza79f7vs59rirgy-asciidoctor-1.5.6.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: asciidoctor

Partial log (click to expand)

1 gem installed
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/shj04hwqd4ai7j15i5gg42mbk5wq2c7j-ruby2.4.3-asciidoctor-bespoke-1.0.0.alpha.1
patching script interpreter paths in /nix/store/shj04hwqd4ai7j15i5gg42mbk5wq2c7j-ruby2.4.3-asciidoctor-bespoke-1.0.0.alpha.1
/nix/store/shj04hwqd4ai7j15i5gg42mbk5wq2c7j-ruby2.4.3-asciidoctor-bespoke-1.0.0.alpha.1/lib/ruby/gems/2.4.0/gems/asciidoctor-bespoke-1.0.0.alpha.1/bin/asciidoctor-bespoke: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/bn1g8vrxx1sxkx641xxsdhk8sjbf71rk-ruby-2.4.3/bin/ruby"
checking for references to /tmp/nix-build-ruby2.4.3-asciidoctor-bespoke-1.0.0.alpha.1.drv-0 in /nix/store/shj04hwqd4ai7j15i5gg42mbk5wq2c7j-ruby2.4.3-asciidoctor-bespoke-1.0.0.alpha.1...
building path(s) ‘/nix/store/zlzclipbs9zhk8wbyz06v9b6g8i80bsk-asciidoctor-1.5.6.2’
created 149 symlinks in user environment
building path(s) ‘/nix/store/158aqwxd4vpwmvbkhj3wajp6hm5gqlmz-asciidoctor-1.5.6.2’
/nix/store/158aqwxd4vpwmvbkhj3wajp6hm5gqlmz-asciidoctor-1.5.6.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: asciidoctor

Partial log (click to expand)

Successfully installed asciidoctor-mathematical-0.2.2
1 gem installed
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/4z62p20qkc8d7xlakg3s9k9kx2aix4mx-ruby2.4.3-asciidoctor-mathematical-0.2.2
patching script interpreter paths in /nix/store/4z62p20qkc8d7xlakg3s9k9kx2aix4mx-ruby2.4.3-asciidoctor-mathematical-0.2.2
checking for references to /build in /nix/store/4z62p20qkc8d7xlakg3s9k9kx2aix4mx-ruby2.4.3-asciidoctor-mathematical-0.2.2...
building '/nix/store/93cc3bk5k99154iz7ia3m2iyyys858i2-asciidoctor-1.5.6.2.drv'...
created 149 symlinks in user environment
building '/nix/store/3vpq76zk3j1jjsk74vpj4laqhjzxzvk9-asciidoctor-1.5.6.2.drv'...
/nix/store/1bmgghismrdlal7vzx84fq3c0wjz525v-asciidoctor-1.5.6.2

@zimbatm zimbatm merged commit 1398cb7 into NixOS:master Apr 12, 2018
@expipiplus1
Copy link
Contributor Author

Thanks @zimbatm!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: ruby 8.has: documentation 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
3 participants
@expipiplus1 @zimbatm @GrahamcOfBorg