Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8f34a8c36821
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a0f534865ee5
Choose a head ref
  • 6 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 4, 2019

  1. asciidoctor: move mathematical gem config to default gemset config 

    This has two benefits:
- Anyone else using the `mathematical` gem will benefit from the config.
- The gem config overrides the default one, so we were losing the fixes
for other gems.

I had to change how the update script works. Now it looks at the `gems`
passthru from `bundlerApp`.
    @michaelpj
    michaelpj committed Jul 4, 2019
    Copy the full SHA
    5f0c43d View commit details
    Browse the repository at this point in the history

  2. asciidctor: include the asciidoctor-epub3 gem 

    This is another common output target for asciidctor that requires an
additional gem.

The previous commit is necessary for this to work, so that we get the
gem config for nokogiri correctly.
    @michaelpj
    michaelpj committed Jul 4, 2019
    Copy the full SHA
    4224920 View commit details
    Browse the repository at this point in the history

  3. asciidoctor: address review comments

    @michaelpj
    michaelpj committed Jul 4, 2019
    Copy the full SHA
    8559363 View commit details
    Browse the repository at this point in the history

  4. asciidoctor: wrap asciidoctor-epub3 for epubcheck and kindlegen 

    kindlegen is unfree, so we don't include it by default. The derivation
can be overridden to include it.
    @michaelpj
    michaelpj committed Jul 4, 2019
    Copy the full SHA
    d6b7b2a View commit details
    Browse the repository at this point in the history

  5. asciidoctor: fix update.sh

    @zimbatm
    zimbatm committed Jul 4, 2019
    Copy the full SHA
    f726160 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #64298 from michaelpj/imp/mathematical-epub3 

    asciidoctor: include the asciidoctor-epub3 gem
    @zimbatm
    zimbatm committed Jul 4, 2019
    Copy the full SHA
    a0f5348 View commit details
    Browse the repository at this point in the history