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

(backport) asciidoctor: 1.5.7.1 -> 2.0.10 #63327

Merged
merged 2 commits into from Jun 20, 2019
Merged

(backport) asciidoctor: 1.5.7.1 -> 2.0.10 #63327

merged 2 commits into from Jun 20, 2019

Conversation

knl
Copy link
Contributor

@knl knl commented Jun 17, 2019 •
edited

original message:
There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:

  • asciidoctor-latex seems dead, and hasn't had any commits since 2015.
  • asciidoctor-bespoke also hasn't been updated for over a year, and
    doesn't seem to be compatible with the new version.

addendum:
asciidoctor-bespoke is back

(cherry picked from commit 3d1e0da)

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@basvandijk
Copy link
Member

@GrahamcOfBorg build asciidoc

@basvandijk basvandijk self-requested a review June 17, 2019 14:11
basvandijk
basvandijk reviewed Jun 17, 2019
View reviewed changes
pkgs/tools/typesetting/asciidoctor/Gemfile Outdated
@@ -1,9 +1,7 @@
source 'https://rubygems.org'
gem 'asciidoctor'
gem 'asciidoctor-diagram'
gem 'asciidoctor-bespoke'
Copy link
Member

Choose a reason for hiding this comment

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

We generally don't like to remove functionality from release branches. Is there a way to bring this back?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I created one commit on top, that brings back bespoke. @basvandijk PTAL.

michaelpj and others added 2 commits June 20, 2019 14:46
@michaelpj @knl
asciidoctor: 1.5.7.1 -> 2.0.10
257c2f6 
There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:
- `asciidoctor-latex` seems dead, and hasn't had any commits since 2015.
- `asciidoctor-bespoke` also hasn't been updated for over a year, and
doesn't seem to be compatible with the new version.

(cherry picked from commit 3d1e0da)
@knl
asciidoctor: bring back asciidoctor-bespoke
fc7442d
@knl knl force-pushed the backport-asciidoctor-upgrade branch from cb3c7b6 to fc7442d Compare June 20, 2019 12:48
@basvandijk
Copy link
Member

@GrahamcOfBorg build asciidoc

@basvandijk basvandijk merged commit 61d57f8 into NixOS:release-19.03 Jun 20, 2019
@danbst danbst mentioned this pull request Jun 26, 2019
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk basvandijk left review comments

Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@knl @basvandijk @michaelpj